folder name slipped through
version number style change
release-1.0 merged to master
Merge branch 'develop'
moving master to issue 1.2
files modified for pypi download tar.gz package
documentation catchup
general tidying up of scrappy code
Merge branch 'master' into develop