Sync Linux with Mac
Merge branch 'master' of github.com:selesse/config

Conflicts:
	.vimrc