Merge branch 'master' into ilios-tests
add travis
Insert build status into README
rm comment
Merge branch 'ilios-tests'
\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 #61 from Trott/master

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

re-integrate release branch 2.2
Merge pull request #64 from ilios/rb2.2

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

tweaked formatting
extended mime-type mapping for .pptx files

mime-magic "detects" Microsoft PowerPoint 2007/2010 OpenXML files as Microsoft PowerPoint 97 files.
Sure - WHY NOT! :hankey:
Merge pull request #69 from ucsflibtopfstedt/rb2.2

various fixes and improvements