Merge branch 'master' into ilios-tests
add travis
Insert build status into README
rm comment
Merge branch 'ilios-tests'