Add support for content type in file storage.
Fix test case due to new file object.
Merge in upstream changes.
Update file attribute passthrough to use a configuration variable.
Update documentation.
Remove stray print statement.
Fix methods/get query param bugs
Fix pagination with ?version=diffs
Merge pull request #333 from joshvillbrandt/develop

Fix sorting with ?version=diffs
Rename defaults_value.py to defaults.py

Will hopefully cause less confusion since we also have
defaults_settings.py in the same folder. Moving the file to the methods
folder (as discussed in #327) didn't seem appropriate as the module is
being used in the flaskapp module too.
HATEOAS links as business unit values.

HATOEAS link for the item and resource espresses the business unit value
even when regexes are configured for the resource endpoint. This applies
to resource and item endpoints. Home links are still showing
the regexes (as they are not computable based on the current request).
To address these I plan to add a filter/parser in the near future.
Delete orphaned function
Add py34 to tox envlist
typo and py34 on testing page
Ben Demaree
Extend EXTENDED_MEDIA_INFO documentation.

Examples of different payload formats.
EXTENDED_MEDIA_INFO
Merge branch 'bendemaree-mimetype' into develop

Conflicts:
	CHANGES