intermediate commit:
in progress of switching to the Ohm ORM for redis
Merge branch 'master' into heroku
DRY
Intermediate commit...again
Removed Redis ORM
Added Size to metadata and fixed bug
Added loading indicator gif to main page
Merge branch 'develop' of github.com:ehaughee/ServeIt into develop
Speficcally, removed rmacy's edits as they were out of date with the
changes I have made since
Conflicts:
	scripts/indexer.rb