changes from alpha
Merge branch 'master' into from_alpha

Conflicts:
	.bash_profile
	.vimrc
	bash_prompt.bash