Added timetrap to install_ruby.
Merge remote-tracking branch 'origin/master'

Conflicts:
	install_prereqs
Updated host in reverse_tunnel
Moved gitk and xclip to prereqs_desktop.