Fixed more formatting derps.
Fixed incomplete sentence.
Merge branch 'master' into newenv