Fix merge conflicts#1

Open

christopheranderson wants to merge 4 commits intomatthewmeyer:feature-watch-modefrom

Azure:matthewmeyer-feature-watch-mode

Commits on Jan 18, 2018

chore: fix dockerfile to allow the CI to process (#61)

matthewmeyer
authored and
Christopher Anderson
committed

Commits on Jan 23, 2018

fix: require is not a function (#65)

puhoy
authored and
Christopher Anderson
committed

Commits on Jan 24, 2018

merge conflicts
Christopher Anderson
committed
small bug
Christopher Anderson
committed