Better configuration source expression
Updated history
Merge conflict resolution
Merge branch 'master' of github.com:lorenwest/node-config