More stuff in the .gitconfig (push and merge)
Remove syntastic and get back powerline

Still not satisfied by powerline, but will do untill I find another
solution
Merge branch 'master' of github.com:geekingfrog/configFiles

Conflicts:
	.vimrc