Changed mocha shortcut from 't' to 'n'
Changed tab functionality
Merge branch 'master' of github.com:chris--young/dotfiles

Conflicts:
	.vimrc