Fix to mergevalues doc
various little changes
Docs changes
fixed tests for Travis in branch 0.4.0