Better vim and shell setup
Merge branch 'master' of github.com:brendan/brendan.conf

Conflicts:
	vimrc