Merge in from remote dev
Remove trailing slash in vim
merge in remote gitconfig
Adds common stuff to php snippets
Default git push to simple
vimrc: adds a few php/whitespace related plugins, nerdtree toggle on ,,