build and test merchant in progress
paired with rachel for setup help
clean out some old code/comments
Merge pull request #1 from Tmee/katebranch

Katebranch