Update for Diva to use the imageRoot setting
Fixing circular dependencies
clean up unused imports
Merge branch 'master' of github.com:ahankinson/imageserve

Conflicts:
	imageserve/helpers.py
	imageserve/views.py
add template tag directory
Updated templates
Add an admin model for the cache table
Ensure all strings are unicode
Switch to a database cache backend

Memcached was crapping out
Formatting
Update middleware and enable template context processors
Add django pagination app
Formatting, add views for search and goto
Update bootstrap