adding params
merge with mapping, closes #152
fix datasets reference
move json loading to controller, closes #442
use sleep delay
add monit deploy files, working with bamboo, celeryd, nginx, closes #398
docs
merge map applies to update
pep8
fix mapping checks
split mapping from no mapping merged calls
Merge pull request #448 from modilabs/merge-map-152

Merge map 152