Random changes.
Merge branch 'master' of https://github.com/shultzm/dotfiles

Conflicts:
	.bash_aliases