Merge branch 'master' into ilios-tests
bumped up version number.
added v2.2 section to changelog
add travis
Insert build status into README
rm comment
added readme for phpunit tests.
Merge pull request #57 from ucsflibtopfstedt/rb2.2

updated changelog, bumped version number
Merge branch 'ilios-tests'
fixed name of default php unit configuration file in the setup instructions.
Merge pull request #58 from ucsflibtopfstedt/rb2.2

fixed name of default php unit configuration file in the setup instructions
\n => PHP_EOL
updated install and upgrade instructions for v2.2 release.
Fix infinite loop when test log file is only one line long
Merge branch 'ilios-tests'
remove status image from another branch
Merge pull request #59 from ucsflibtopfstedt/rb2.2

updated install and upgrade instructions for v2.2 release.
added missing comma.
Merge pull request #60 from ucsflibtopfstedt/rb2.2

added missing comma.
Merge pull request #61 from Trott/master

Travis integration