Added spec and Travis build stuff
Commit to check travis
Fix .travis.yml
Merge pull request #2 from boxen/add_tests

Add tests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md