updates
Merge branch 'master' of github.com:ktham/my_setup

Conflicts:
	install.rb