Fixed merge
Merge branch 'master' of https://github.com/abates/dev-env

Conflicts:
	bin/setup_ubuntu_rails.sh