Merge branch 'bosshack/master'

Conflicts:
	.vim/polka.bundle
	.vimrc