Updated ruby version to 2.1.1.
Import WordMarkings with the activerecord-import gem.
Refactored marking import code into class methods on the model.
updates .travis yml file.
updates travis.yml.
Add foreman to development group
Merge branch 'develop' of github.com:scholarslab/prism into develop
Merge branch 'master' into develop
Update to use Unicorn over thin

Use Unicorn to process concurrent requests by running multiple Ruby processes in the dyno
Add PG gem

heroku likes to have pg installed
Moved the method to process prism content into the model.

Now with tests!
Don't import markings beyond the length of the prism.
Don't allow multiple indexes.

This isn't enforced in the database, and because we want to be able to
bulk load the indexes later, we have to load them all at once.
Removed trailing whitespace.
Merge branch 'highlight-post' into develop

Conflicts:
	app/controllers/prisms_controller.rb
Removed spec tags for current.