Develop (Travis cli test)

This pull request is just so that I can get Travis CLI to check it to make sure that the code is somewhat stable before I do a merge.