diff --git a/.gitmodules b/.gitmodules
index ca2142b..2412e08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -56,3 +56,9 @@
 [submodule "bundle/vim-es6"]
 	path = bundle/vim-es6
 	url = https://github.com/isRuslan/vim-es6.git
+[submodule "bundle/phpcomplete.vim"]
+	path = bundle/phpcomplete.vim
+	url = https://github.com/shawncplus/phpcomplete.vim
+[submodule "bundle/wordpress.vim"]
+	path = bundle/wordpress.vim
+	url = https://github.com/dsawardekar/wordpress.vim
diff --git a/.vimrc b/.vimrc
index c228f82..c70d5fd 100644
--- a/.vimrc
+++ b/.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
+
 
diff --git a/bundle/emmet-vim b/bundle/emmet-vim
index ed79a92..350f0ba 160000
--- a/bundle/emmet-vim
+++ b/bundle/emmet-vim
@@ -1 +1 @@
-Subproject commit ed79a9264d66def73c1ccc10198a58ebe1531ba4
+Subproject commit 350f0ba10b9ee65837fc5b04a993b14a7a10e5ac
diff --git a/bundle/nerdtree b/bundle/nerdtree
index 8a6ae7c..68572ef 160000
--- a/bundle/nerdtree
+++ b/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 8a6ae7c6338378b6bb28ad0cf03e71ff0fd11a5a
+Subproject commit 68572ef46143c5c7d420a6ec86f1ec4595765ce5
diff --git a/bundle/phpcomplete.vim b/bundle/phpcomplete.vim
new file mode 160000
index 0000000..2c98f34
--- /dev/null
+++ b/bundle/phpcomplete.vim
@@ -0,0 +1 @@
+Subproject commit 2c98f348d1192ec7793d93200ec7981fa0dd07fa
diff --git a/bundle/quicktex b/bundle/quicktex
index e49d7bd..75dcdd4 160000
--- a/bundle/quicktex
+++ b/bundle/quicktex
@@ -1 +1 @@
-Subproject commit e49d7bd892fec29f0d96f3c96d9554d9a9a9376d
+Subproject commit 75dcdd4cbfd5c9167044447a4922201ef630f246
diff --git a/bundle/united-front b/bundle/united-front
index a8b3fc3..2320f65 160000
--- a/bundle/united-front
+++ b/bundle/united-front
@@ -1 +1 @@
-Subproject commit a8b3fc3762f3142c3a3f141e39ac23b759fe6582
+Subproject commit 2320f65a364f82c1c019159e12b4f198e7e941f6
diff --git a/bundle/vim-airline b/bundle/vim-airline
index 27acd85..c2ffb8b 160000
--- a/bundle/vim-airline
+++ b/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit 27acd851a780c563cb4807fc0ea3af9caccbb585
+Subproject commit c2ffb8b3ec114301795036f7bf22995746d2acaf
diff --git a/bundle/vim-airline-themes b/bundle/vim-airline-themes
index af3292d..4b7f77e 160000
--- a/bundle/vim-airline-themes
+++ b/bundle/vim-airline-themes
@@ -1 +1 @@
-Subproject commit af3292dbbb6d8abe35d0ad50bd86b6ac6219abb7
+Subproject commit 4b7f77e770a2165726072a2b6f109f2457783080
diff --git a/bundle/vim-css3-syntax b/bundle/vim-css3-syntax
index a552f6b..2ed6105 160000
--- a/bundle/vim-css3-syntax
+++ b/bundle/vim-css3-syntax
@@ -1 +1 @@
-Subproject commit a552f6b7b299ba7138a34b4f3007eecc31e9f62b
+Subproject commit 2ed61056a8e626394b63866ef6d58964d9544346
diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive
index 8f60d1d..b82abd5 160000
--- a/bundle/vim-fugitive
+++ b/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 8f60d1d459362771cb68c0097565efdf52e62ec3
+Subproject commit b82abd5bd583cfb90be63ae12adc36a84577bd45
diff --git a/bundle/vim-json b/bundle/vim-json
index f5e3181..3727f08 160000
--- a/bundle/vim-json
+++ b/bundle/vim-json
@@ -1 +1 @@
-Subproject commit f5e3181d0b33a9c51377bb7ea8492feddca8b503
+Subproject commit 3727f089410e23ae113be6222e8a08dd2613ecf2
diff --git a/bundle/vim-pandoc b/bundle/vim-pandoc
index fc209c6..3a68678 160000
--- a/bundle/vim-pandoc
+++ b/bundle/vim-pandoc
@@ -1 +1 @@
-Subproject commit fc209c66e937172efdd6db39ee64fcb3980ce329
+Subproject commit 3a686781ab5ea622616798475deb394e48d3cc48
diff --git a/bundle/vim-rmarkdown b/bundle/vim-rmarkdown
index 8c1c397..3de5ed4 160000
--- a/bundle/vim-rmarkdown
+++ b/bundle/vim-rmarkdown
@@ -1 +1 @@
-Subproject commit 8c1c3979554bdff08239a2fe441af4d7dfeea8bc
+Subproject commit 3de5ed4dbbdd58f436f2b9b3dad770e44db25831
diff --git a/bundle/vim-table-mode b/bundle/vim-table-mode
index a646b40..bdd96b0 160000
--- a/bundle/vim-table-mode
+++ b/bundle/vim-table-mode
@@ -1 +1 @@
-Subproject commit a646b4033ba86496ee0fff442ce8540551040275
+Subproject commit bdd96b05cbaef55baf52bf79f765aad94f64941c
diff --git a/bundle/vimtex b/bundle/vimtex
index 770b518..51a7abe 160000
--- a/bundle/vimtex
+++ b/bundle/vimtex
@@ -1 +1 @@
-Subproject commit 770b5183d621eb5a0c8bbee7e05bbceff2d2c4f7
+Subproject commit 51a7abefb5e321680eebb08007c1ca1356b90a5a
diff --git a/bundle/wordpress.vim b/bundle/wordpress.vim
new file mode 160000
index 0000000..1d28c74
--- /dev/null
+++ b/bundle/wordpress.vim
@@ -0,0 +1 @@
+Subproject commit 1d28c74c87d69f31e2768e57d3175a3a543e5a72