Initial dev infrstructure set up
Merge branch 'master' of https://github.com/CoffeeMakerCP2013/Coffee-Maker