Merge branch 'master' of github.com:Jab2870/vim

.vimrc

@@ -262,6 +262,8 @@ endfunction
 " Move lines up/down using arrow keys
 nnoremap <Down> ddp
 nnoremap <Up> ddkP
+nnoremap <Right> xp
+nnoremap <Left> xhP
 
 " Activate spelling
 nnoremap <F7> :set spell!<cr>
@@ -310,7 +312,6 @@ iabbrev @@ jonathan@fellowshipproductions.co.uk
 iabbrev @@@ jonathan@lunarweb.co.uk
 
 
-
 " Start Screen Settings {{{1
 fun! Start()
     " Don't run if: we have commandline arguments, we don't have an empty
@@ -363,7 +364,7 @@ augroup END
 " Add Html maps, Currently only pandoc conversion {{{2
 augroup html
 	autocmd!
-	" Run current line through pandoc.  
+	" Run current line through pandoc.
 	" Convert from markdown to html
 	autocmd FileType html nnoremap <localleader>p :.!pandoc -t html -f markdown-auto_identifiers --wrap=preserve<cr>
 	"convert from html to markdown
@@ -410,4 +411,10 @@ augroup detectES6
 	autocmd BufNew,BufNewFile,BufRead *.es6 :setlocal filetype=javascript
 augroup END
 
+""set htaccess variations to apache {{{2
+augroup detectHtaccess
+	autocmd!
+	autocmd BufNew,BufNewFile,BufRead *.htaccess,*.localhtaccess,*.livehtaccess :setlocal filetype=apache
+augroup END
+