[#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
[#518] Adds date-time tooltip to the activity time
[#518] formatter now give x months ago etc
[#518] Refactor render_datetime
[#518] Add time_ago_from_datestamp() helper
[#518] Deprecate time_ago_in_words_from_str() helper
[#518] Fixes for activity stream item template
[#1141] Fix bug where we weren't raising Exception when we couldn't find plugin
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