BugFix Datamark/core.py:
* reading 0.5 datawide (4 bits) data format
* Reads the full channel number as 4 char hex: 0000 to ffff
corrected test issue (now that we read channel id correctly...)
PEP8 cleaning (I don't find it cleaner, but OK)
changelog for obspy.datamark
Merge pull request #721 from ThomasLecocq/fix_datamark

BugFix obspy.datamark
Merge remote-tracking branch 'upstream/releases'

Conflicts:
	obspy/datamark/core.py
datamark again Py3k compatible...
avoid nested for loops in list comprehensions
Merge branch 'releases'

Conflicts:
	obspy/station/inventory.py
add a check for the station id to Network.get_response()
minor fixes for auto api docs
Merge remote-tracking branch 'upstream/releases'
refactoring obspy.station.inventory.Inventory.get_response()
basic tests for Inventory.get_response() and Network.get_response()
only call get_response() on Networks with matching id
Merge remote-tracking branch 'kaeufl/releases' into releases

Also some refactoring, flake8 etc.

Conflicts:
	obspy/station/inventory.py
Merge remote-tracking branch 'upstream/releases'
Py3k: removing problematic future.builtins int

Was causing errors in docs
Merge pull request #725 from mbyt/no_future_int

Py3k: removing problematic future.builtins int
Merge branch 'master' into geojson