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

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

Adding separate key file for MER, to setup personal accts.
Add brian's keys
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
start of /licensed/ stack
temp hack for strange nuxeo icon bug
remote nuxeo access
Comments disappeared?
Don't hammer stuff
Merge branch 'master' of https://github.com/mredar/appstrap

Conflicts:
	ansible/solr-playbook.yml
Stop hammering things, still needs more
less hammering.