Removed some things from vimrc, new time command
Merge branch 'master' of github.com:rsprabery/dotFiles

Conflicts:
	zshrc