better type checking on FakeRedis.zadd and fixing race condition in WindowManager
Merge branch 'develop' into feature/issue-474-window-manager-race-condition
Documenting the race condition and adding missing test cleanup
Use non-broken JSON parser even when riak chooses a broken one.
Merge branch 'feature/issue-474-window-manager-race-condition' into develop
Merge branch 'develop' of github.com:praekelt/vumi into develop
fix & test for get_data() race condition in WindowManager
test for logging error & message when dispatchers get something truly unroutable (thanks @hodgestar)
extra logging for WindowManager (thanks @jerith)
Don't pass None as a failure reason.
Add test for bad response command status.
Merge branch 'feature/issue-452-fix-handling-nacks-with-no-reason' into develop
Revert "fix & test for get_data() race condition in WindowManager"

This reverts commit ee595f72ee12a2c9ed22ea312eeb249acb2ba26e.
Switch order of redis.set() and redis.lpush() in WindowManager.add so that the day for a key is available before the key is added to the window.
Merge branch 'feature/issue-476-window-manager-get-data-race-condition' into develop
Add mapreduce_timeout option to riak_manager config. Default to 4 * 60 * 1000 milliseconds.
Add tests for setting mapreduce_timeout from config.
Add test for timeout setting.
Merge branch 'feature/issue-478-set-custom-timeout-on-mapreduce-jobs' into develop
Merge branch 'develop' into feature/issue-475-apposit-sms-integration