fix live reload and grunt watch for sass
Merge branch 'master' of github.com:ChartKillers/CropTracker into JW
Merge branch 'JW'