Make all specs pass
Update README.md

Added the build tag
Update README.md
Added Marionette to the picture
Added teaspoon to test JS code
Fix travis build
Merge branch 'master' into prod