change to rst and cleanup
Merge branch 'uqam'