Merge branch 'php' into wip
Rename config to add a .vim extention for syntax highlighting
NeoBundle update
Merge branch 'wip' into php