Fixed some doc and removed a spurious line (looking at you vim!)
Merge remote-tracking branch 'origin/master'