Merge pull request #169 from ilios/rb2.3

Merge pull request #168 from ilios/master
Merge pull request #170 from ilios/rb2.3

fixed condition for showing the link to currriculum inventory manager pa...
Merge pull request #172 from ilios/rb2.3

reintegrate rb2.3 into master
Merge pull request #174 from ilios/rb2.3

Rb2.3
Merge pull request #176 from ilios/rb2.3

reintegrate rb2.3 into master
Merge pull request #177 from ilios/rb2.3

reintegrate release branch rb2.3 into master
Merge pull request #178 from ilios/rb2.3

added course clerkship type info to course details display. refs #3784
Merge pull request #179 from ilios/rb2.3

reintegrate release branch rb2.3 into master
Merge pull request #180 from ilios/rb2.3

reintegrate release branch rb2.3 into master
Merge pull request #181 from ilios/rb2.3

fixed regression in client-side sequence block form validation. refs #37...
Merge pull request #183 from ilios/rb2.3

reintegrate rb2.3 into master
upgrade settings so Vagrant 1.2.7 works
Merge pull request #1 from Trott/vagrant-upgrade

upgrade settings so Vagrant 1.2.7 works
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