various.
Merge branch 'master' of github.com:memmett/memmett-home

Conflicts:
	bash_profile