initial stoplist
confict resolution
Merge branch 'master' of https://github.com/sgsinclair/Voyant