Merge pull request #476 from modilabs/changes_to_merge_call

Changes to merge call
organize routes
fix resample docs
fix rolling and docs
add docs for set_olap_type, closes #475
remove print
Merge pull request #477 from modilabs/docs

Docs, passes locally
docs typo
start debugging travis, add pip freeze to show installed libs
trying new config
check shared memory permissions, must be writable by user running celeryd
add write/sticky perms to shared memory
try to run celeryd as root
run celeryd in DEBUG mode, maybe we can get more info
no sudo for celeryd
show more info
try running celeryd directly
add chown
try installing scipy from apt exp
revert