Clean up some code.
Add Mac OSX updates to the install.sh script.
Turn on Salt for testing on OS X.