consolidating differences between master and work branches
Merge branch 'master' into work

Conflicts:
	bash_aliases