Changed to lein test
Merge remote-tracking branch 'origin' into develop
Updated travis