OSX/cask

Conflicts:
	provision/osx-10.9
do not run as root provision os x
conditionally install xcode and chsh
fix old homebrew install command
Merging inn changes from naggie
+uptime
Lots of changes based on my setup