Merging in master; one conflict.
Merge branch '1090-svg-png' of https://github.com/ENCODE-DCC/encoded into 1090-svg-png
Integrated with new browser.js mechanism, and improved feature class string construction.