Updating rspec
Fixed tests
Merge branch 'jamon_improvements' into tumblr-style-editor-controls