Fix config (for scow)
Merge branch 'develop' of github.com:hipikat/hipikat.org into develop