Bug surrounding annotation delete. The icons were not being positioned properly. And, the "to-delete" div was not specified nicely.
float footer logo left to stop interference with selection creation. temporary solution
Travis CI is failing due to an improper import by Lettuce. Upgrading *should* fix the issue. We'll see.
And - removing lettuce configuration from the basic meth configuration. It is added back in settings_test. Travis should be able to run properly with just an in memory database.
enabled static files in settings
updated static file paths in templates

Conflicts:
	mediathread/templates/taxonomy/taxonomy_workspace.html
one more path fixed
more paths fixed
using media folder as it is now
fixed paths in the taxonomy template
moved minified script to extrahead
* adding an ajax_required view decorator. Very handy
faculty_only decorator
Merge branch 'develop' of git.ccnmtl.columbia.edu:mediathread into taxonomy
Major refactoring of the asset & annotation rendering layer.
Getting started on migrate on behalf of
Finishing up Instructor: Select authors on course migrations.
css tweak
Updating name for admin area. Apparently, there was a lot of confusion about this.
migrate taxonomy on test db