Add Grunt support #98
Filter for aborting the upload for whatever reason #110
Merge pull request #115 from deliciousbrains/abort-upload-filter-110

Filter for aborting the upload for whatever reason
Merge pull request #108 from deliciousbrains/add-grunt-support-98

Add Grunt support
Remove function alias. #117

Since the alias didn't do anything and has been in the released plugin
for a long time, not point keeping it around.
Fill in secure attachment url function #117
Merge pull request #118 from deliciousbrains/secure-attachment-url-function

Secure attachment url function
Merge branch 'develop' into retrospective-region-meta-update-95

Conflicts:
	wordpress-s3.php