updated marg docs
formatting
cleanup for string join
Merge branch 'master' of https://github.com/yogthos/Selmer