last commits before the big move
Merge branch 'devel'
updated changelog
bumped version
fixes #116
fixed versioning
fixed doc version
lots of documentation updates
updated conf