Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' of github.com:ilios/ilios
Now install phantomJS through composer.
Also clean up some documentation issues from [5309f9289a8ef056c673348b5b499610cd3621da] where the selenium jar was not referenced corectly.
Use selenium standalone aquired from composer to run behat tests in travis.
Merge pull request #544 from jrjohnson/addphantomjs

Install phantomJS through composer
Merge branch 'master' of github.com:ilios/ilios
update comment
comment
remove nonsense to fix #545
minimal specs for CourseModel
Merge pull request #546 from Trott/545

545
Update README.md

change contact information to reflect reality and direct inquiries directly to the Ilios team.
Update README.md
Merge branch 'master' of github.com:ilios/ilios
Update behat.yml

remove my leftover (and incorrect) comment cruft
Merge branch 'master' of github.com:ilios/ilios
updated CHANGELOG.txt, ready for release 2.4.1
Merge pull request #547 from ilios/rb2.4.1

updated CHANGELOG.txt, ready for release 2.4.1
Merge branch 'master' of github.com:ilios/ilios