commiting recent changes
Merge branch 'master' of github.com:jmervine/dotfiles

Conflicts:
	.aliasrc