merge
Merge branch 'master' of github.com:hipponot/vagrant
Merge branch 'master' of github.com:hipponot/vagrant
osx mods to load_cluster_def
TC fe dev box for developers