Cleaning experimental work out of master
Cleaning more dev stuff
Version bump
Merge branch 'version-2.0'
Merge 'version-2.0' into development