Merge branch 'migrations' of https://github.com/ucsflibtopfstedt/ilios
Merge pull request #73 from Trott/ilios-tests

phing build.xml + PHPUnit tests
Merge branch 'master' of github.com:ilios/ilios
Merge branch 'master' into ilios-tests