adjust package name to something less generic
rename everything to something unique for pypi
set version
merge from master