New models and db schema for wayne to review.
Adds indices to some models.
Fixes (at least in theory) the highlight method according to the new models and eliminates unused code related to the sandbox.
NOW these should be the final models. Added a has_and_belongs_to_many relationship between facets and word_markings as well as a color attribute for facets.
Updates the views to use the new facets table. Ironically, the code is now virtually the same as before the refactoring.
Cleans up some redundant migrations as per a require from Wayne.
Creates fields for nested attributes - ie. it creates multiple facet models associated with the prism. Still need to give these default colors and orders.
New schema re-write
Merge remote-tracking branch 'origin' into feature/betteruserupload
Some migrations I forgot to add.
Merge branch 'feature/betteruserupload' of https://github.com/scholarslab/prism into feature/betteruserupload

Conflicts:
	app/views/prisms/new.html.erb
Adds a route for myprisms based on the current user_id. It will obviosuly need to be changed for security so that it uses the session id., but at least there is a route now.
Merge Shane branch into develop.
Fix merge conflicts that time.