More edits to vimrc
Merge branch 'master' of github.com:JCook21/vip
Edits to layout and plugins.
Added customised templates for php comments.