Try to make all tests pass
Merge branch 'travis-fix' of github.com:SWTI2014/SWTI2014-Project-03 into travis-fix