Merge pull request #6 from ryersonlibrary/master

Update to latest from MJ
Pin vagrant-berkshelf to EXACTLY 2.0.1 to avoid 3.0+
Merge pull request #12 from paulwc/master

Merge pull request #6 from ryersonlibrary/master
Revert "Merge pull request #6 from ryersonlibrary/master"
Merge pull request #13 from ryersonlibrary/revert-12-master

Revert "Merge pull request #6 from ryersonlibrary/master"
Merge branch 'upstreammerge'