Merge pull request #68 from Trott/ilios-tests

Get rid of DB warnings on CI phpunit tests using PHP 5.4
Merge branch 'master' into ilios-tests