cleanup and v0.4prep

update to v0.3.15-beta
Update to v0.4.0-beta-r

the v0.4.0-beta release will be commited and then rolled back since the
code has to be changed for being integrated into term and stand-alone