updates
Merge branch 'master' of github.com:firstandthird/init

Conflicts:
	conf/bash_profile