Merge pull request #184 from Trott/master

incorporate vagrant updates into master repo
Merge pull request #185 from ilios/master

roll changes to master into release branch
Merge pull request #186 from ilios/rb2.3

Merge pull request #185 from ilios/master
re-enable cucumber tests
Merge pull request #187 from Trott/vagrant-upgrade

re-enable cucumber tests