[#981] Allow users to create a ckan resource and a datastore resource with one call
[#981] Define datapusher_submit action
[#981] Disable test until #547 resolves issues with routes in plugins
Merge branch 'master' into 981-extend-datastore-create

Conflicts:
	ckanext/datastore/logic/action.py
	ckanext/datastore/plugin.py
[#981] Add auth function to datapusher command
Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create
[#981] Use resource instead of package_id
[#981] Require latest httpretty
[#981] Test whether we properly call the datapusher
[#981] Call datapusher according to API
[#981] Add hack to avoid hanging tests in python 2.6
[#981] Fix test to use ckan app by @tobes
Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create
[#981] Change import, tab -> spaces
[#938] Save the status of the datapusher task
[#938] Don't push jobs to datapusher if datapusher url is not set
Merge remote-tracking branch 'okfn/1130-various-db-upgrades' into 938-datapusher
[#932] Use the url_type to indicate when a resource is a pure datastore resource
Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create

Conflicts:
	dev-requirements.txt
[#981] Declare auth function