Merge pull request #14 from mo-nathan/travis

Travis is now working!
Fixed non-deterministic tests