Merge pull request #521 from leonidg/leonidg-misc

Leonidg misc merge. Some cleanup and a
Some JS was breaking when being jammed together by django-pipeline.
Fixed, I hope. Fixes #524

Also ran into a string concat issue in models. Fixed.
Fix an edge case that caused the bug in #475 to sometimes reoccur