Code reformat / cleanup
New version, as imagequery now supports Django 1.6 (url import changed)