fixed a bug and removed some extra markup
removed old templates and accounted for inline plugin editing
Merge remote-tracking branch 'upstream/master'
Django 1.6 compatibility; version bump to 1.6.0
Django 1.6 compatibility; version bump to 1.6.0