Stuff
Merge branch 'master' of github.com:Funkmyster/Terminal

Conflicts:
	vim/vimrc