Refactor UI tests to be simpler
Update to the latest version of Django Hstore

Both of the changes made in our fork have been accepted upstream.
Merge pull request #1690 from steventlamb/topic/refactor_ui_tests

Refactor UI tests to be simpler
Merge pull request #1692 from maurizi/update-django-hstore

Update to the latest version of Django Hstore
Initial copy over - runserver fails to load
Rename mapState.js to urlState.js
Update old mapState references
Use ramda for function composition

I propose that using this library will reduce the amount of boilerplate
we need to put in BaconUtils and will give us more power to compose
functions for use in bacon and underscore.
Don't create tree when udfc data is empty

fixes #1077 on github
Merge pull request #1689 from steventlamb/topic/dont_create_tree

Topic/dont create tree
Change modeling feature names
Factor out dotted split
Fix big in nested translation instruction

The inner trans block was rendering straight to the client as is, due to
the blocktrans.
Don't raise on ecobenefit errors

fixes #1650 on github
Set data attribute when resolving alerts

Fixes #1698

This fixed a regression introduced by 1f0f44e1, which stopped reading
values from .html() and started reading values from .attr(). The resolve
button was setting the body text of the element, but not the data
attribute.
Merge pull request #1700 from jwalgran/topic/fix-alert-resolution

Set data attribute when resolving alerts
Merge pull request #1695 from RickMohr/template-tweak

Change modeling feature names
Move plotUdf initialization to a module
Add markup required for receiving resolve buttons

fixes #1583 on github
Make plotUdf module more readable