I had the same problem and I added the following lines to my vimrc to fix the movement issues.
noremap j gj
noremap k gk
http://vim.wikia.com/wiki/Move_cursor_by_display_lines_when_...
noremap j gj
noremap k gk
http://vim.wikia.com/wiki/Move_cursor_by_display_lines_when_...