Merge branch 'master' of https://github.com/ucldc/appstrap
Merge pull request #24 from mredar/master

Add cron job for dbdump from registry & nuxeo
update for new java
Merge pull request #25 from mredar/master

Add new pub key for MER
Merge pull request #26 from mredar/master

Adding separate key file for MER, to setup personal accts.
Merge pull request #27 from mredar/master

Add brian's keys
freeze pip version for now
more friendly redirect
odd stall, maybe dependency order issue?
new location for InCommon metadata
switch discovery service
don't need DiscoFeed anymore

left it in shibboleth conf
Merge branch 'master' into aspace