Update default user accounts to be Andy, Bilal, Graham, Zhao.
Merge branch 'develop' of git.library.utoronto.ca:central-library-services/mymedia into develop
Initial work towards a transportable git image for use on vms.
Merge branch 'develop' of github.com:utlib/avalon into develop
Merge branch 'develop' of git.library.utoronto.ca:central-library-services/mymedia into develop
Add shibboleth strategy for omniauth.
Functioning dev environment.
Fix hydra_head and blacklight versions.
Put the default config files in our repo.
Add some placeholder units.
corrected password for fedora
Merge branch 'develop' of github.com:utlib/avalon into develop
Merge branch 'develop' of git.library.utoronto.ca:central-library-services/mymedia into develop
Merge branch 'develop' of github.com:utlib/avalon into develop
Merge branch 'develop' of github.com:utlib/avalon into develop

Conflicts:
	Gemfile
	Gemfile.lock