merge conflicts and copy edits
Merge pull request #144 from taylorharwin/fix-merges

Fix merges