breaking up/adding vars updates
Merge branch 'master' of github.com:e2tha-e/nbcuuomerch_fep_poc into cleanup-vars
removing sourc/src from gitignore-was supposed to be temp
Merge branch 'master' of github.com:e2tha-e/nbcuuomerch_fep_poc into cleanup-vars
updating config.rb to turn off comments as def, plus other settings
compile updates from config.rb changes
Merge branch 'master' of github.com:e2tha-e/nbcuuomerch_fep_poc into cleanup-vars

Conflicts:
	backend/publisher_placeholder/docroot/sites/all/modules/custom/nbcuuomerch_blocks/css/style.css
	patternlab-php/source/config.rb
	patternlab-php/source/css/style.css
Merge pull request #3 from rebmullin/cleanup-vars

breaking up/adding vars updates