Run both Cucumber and RSpec on Travis
Merge pull request #24 from shepmaster/run-all-tests-on-travis

Run both Cucumber and RSpec on Travis