Converted hydro_stn portal to not have an import loop
Merge branch 'dev' of https://github.com/pacificclimate/pdp into HEAD
Fixed a bad merge, setting application instantiations to their functional form in pdp/__init__.py