updating m.txt from github

playing with the idea of being able to maintain docs in github.
Merge branch 'master' into integration
Merge branch 'trunk' into dev