add outgoing and incoming git aliases
clean vim plugins
Don't highlight long lines in xml and php
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc.symlink