Merge branch 'master' into remote

Conflicts:
	dotbashrc
	install.rb