added session-type/aamc-method mapping to db default population. fixed one broken session type title, removed an obsolete one and added another missing one. refs #3807
added migration for linking session types to AAMC methods. refs #3807
bumped migration counters.
completed session-type/aamc-method mapping for SOM. refs #3807
redefined primary key on session_type_x_aamc_method table.
replaced the value for <AssessmentMethod> and <InstructionalMethod> elements with AAMC method IDs. refs #3810
updated events query to include AAMC method ids rather than Ilios session type titles. refs #3810
Merge pull request #182 from stopfstedt/rb2.3

implemented Ilios session type to AAMC method mapping.
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
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