v/0.4.0 snapshot

updates to 0.4 branch, returning its version to snapshot, cherrypicking doc changes to support versioning, and updating tomcat version

ready to cut rc.2