Removed rvm scripts
Added install basics script
Moved basics to ruby
Updated bootstrap to do less work
Removed debian sources
Use ubuntu, same version as cloud servers
Manually install ruby
Removed commented code
Use apt module
Ensure vim, tidied formatting
Use latest version of php
Merge remote-tracking branch 'origin/master'

Conflicts:
	shell/bootstrap.sh
Move apt-get update to own file
Don't update in ruby file
Tidied mysql
Call update-apt