Fixed remaining issues, made all the tests pass
Attempting travis integration