Merge pull request #1 from Tealium/upstream

Upstream
remove refrence to config.yaml.erb
changes to core
Merge branch 'master' of github.com:Tealium/Jently into upstream