Move back to using stock mocha and specify 'use strict'; explicitly.
Merge pull request #35 from b0ri5/use-strict-explicitly

Move back to using stock mocha and specify 'use strict'; explicitly.
Specify the master branch for the Travis image

A different branch was broken so the build was red. I just thought it defaulted to the master branch but it looks like I any branch is red then the image is red?
Got cabal + hspec working
Merge branch 'master' into build-and-test-haskell
Merge branch 'master' into build-and-test-haskell
Ignore dist/ and the toplevel solvents.cabal
Remove unecessary fields from the example.