Some new stuff
Merge branch 'master' of github.com:seantalts/dotfiles

Conflicts:
	_bashrc