READ.me clarifications
Merge pull request #1 from lumoslabs/campfire_config

Refactor the campfire settings config to be more flexible
Merge branch 'master' of github.com:lumoslabs/campystrano into emoji_config

Conflicts:
	README.md