Update for jenkins install.
Merge branch 'master' of git://github.com/BrianAker/server-install

Conflicts:
	osx.am