Merge branch 'master' into ilios-tests
add travis
Insert build status into README
rm comment
Merge branch 'ilios-tests'
Merge pull request #58 from ucsflibtopfstedt/rb2.2

fixed name of default php unit configuration file in the setup instructions
\n => PHP_EOL
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.
Merge pull request #60 from ucsflibtopfstedt/rb2.2

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

Travis integration
Merge pull request #62 from ilios/rb2.2

re-integrate release branch 2.2
Merge pull request #63 from ucsflibtopfstedt/rb2.2

fixed typo.
Merge pull request #64 from ilios/rb2.2

fixed typo in readme file.
tweaked formatting
Merge pull request #65 from ilios/rb2.2

tweaked formatting