Merge branch 'develop'

tomcat7
Merge branch 'master' of github.com:saltops/saltmine

* 'master' of github.com:saltops/saltmine:
fixed hostname for realz.