merging all dev changes into Master

WIP pull request, this will be open for a while as I (Dom) fixup some features.  This is associated with the currenly opened Milestone in Github.