Merge pull request #883 from stowellm/goat

Significantly improved waffles, added useDev swapping in-app
Merge remote-tracking branch 'upstream/master' into goat