Incorporate Kelli's ms edits
Re-wrap some long lines in ms
Merge branch 'master' of github.com:seananderson/ss3sim