trying to make travis build correctly
trying to make travis build correctly
refactoring intergration tests, all tests pass travis should build
Merge pull request #106 from kmazanec/testing_branch_16

Testing branch 16