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
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
Merge branch 'master' of github.com:ilios/ilios
changed version number to correspond with release
changed version number to correspond with release
Merge pull request #550 from thecoolestguy/update_version_number_to_2.41

Update version number to 2.4.1
Merge branch 'master' of github.com:ilios/ilios
Removed all of the waiting in behat tests
Instead use a FeatureContext::spin and a new FeatureContext::excpetionSpin to try to find elements multiple times before failling.
Remove FeatureContext::iWaitSeconds
Resolves #467
updated CHANGELOG.txt and version.php files, ready for release 2.4.2-prerelease
Merge pull request #551 from thecoolestguy/v242_prerelease

v2.4.2-prerelease-20140407
Switch to project sauce user

Dissociate from the trott sauce labs account and use a project specific
one instead.
Merge pull request #552 from jrjohnson/467-behatspin

Removed all of the waiting in behat tests
making version.php release reflect simply '2.4.2-prerelease'
Merge pull request #554 from ilios/iliossauce

Switch to project sauce user