getting specs to pass, changing some stuff to hg instead of git
other scenarios passing
making happy path test pass
Merge branch 'switch_to_hg'