add 10m to freq choices
filter on freq and market
mark test as failing
test for params in docstring
clean up old views
Merge branch 'master' of https://github.com/WattTime/watttime-grid-api
Merge branch 'master' of https://github.com/WattTime/watttime-grid-api