Rework layout on management page
Styling for management pages
Style small map options maximize button
Minor styling updates to management page
Merge branch 'master' of https://github.com/azavea/OTM2 into topic/default-styling

Conflicts:
	opentreemap/treemap/templates/treemap/field/ul.html
Move bounds layer to the bottom of the layer stack

The updated styling of the boundaries in a4119d52 ended up obscuring
the tree markers so I moved it to the bottom of the stack.
Simplify inline field tag tests
Use custom units and digits in field display and editing

* Add helper functions to units.py
* Make sure plot & tree fields have "in request.instance" so they'll use custom units and digits
* Format display values client-side on form save (digits, units)
* Display eco benefits values using configured units and digits.
* ignore .orig files (generated by kdiff3) and extracollect.py
* Fix inline field tag tests
* Add tests for custom units and digits
* Fixes #330, #371, #458
Merge pull request #556 from RickMohr/show-units

Show units
Merge pull request #559 from jwalgran/topic/reorder-boundary-layer

Move bounds layer to the bottom of the layer stack
Merge branch 'master' of https://github.com/azavea/OTM2

Conflicts:
	opentreemap/treemap/templates/base.html