Starting to merge in the the last 12m or so of work from AHL.
Merging in the the last 12m or so of work from AHL.
Merging in the the last 12m or so of work from AHL.
Merging in the the last 12m or so of work from AHL.
Merging in the the last 12m or so of work from AHL.
added pydev .settings to ignore file
Merging in the the last 12m or so of work from AHL.
Merging in the the last 12m or so of work from AHL.
Fixing typo in import.
Merge branch 'master' into ahl2014

Conflicts:
	pkglib/pkglib/setuptools/_setup.py
	pkglib/setup.cfg