upped v1.4.0 references to allow for renaming of 1.3.6
updated version numbers to reflect current release plans, standardised some since docblock elements
Merge remote-tracking branch 'rojblake/versionbump' into 1.3