added tomcatonboot stuff for osx
Merge branch 'new_setup' of https://github.com/grelland/academy into new_setup