Merge branch 'devel'
bump version
resilence!
bump version a little more
Merge branch 'devel'
small fixes when testing under radical namespace and installing not out of git
bump version
merge conflicts resolved