Testing fix for TravisCI bug.
fix merge issue
Merge pull request #34 from Harvard-ATG/ltiTravisCI

Testing fix for TravisCI bug. Fix works, and merge conflicts taken care off.