Merging in the the last 12m or so of work from AHL.
Merge branch 'ahl2014' of https://github.com/ahlmss/pkglib into ahl2014

Conflicts:
	pkglib/setup.py
Merging in the the last 12m or so of work from AHL.
Merging in the the last 12m or so of work from AHL.