Merge pull request #347 from colinwren/master

Add support for --dev and --prod cli options for specifying environment