1.1.2
Merge remote-tracking branch 'upstream/master'
Allowing passing json objects to confit options instead of defaulting to reading from files
implemting adding override to conft as json object
jshint cleaup
changing to checking for explicit strings for file names on override
Merging Sanjeev's and my changes to confit into one
Merge pull request #21 from pvenkatakrishnan/master

For allowing json objects to be overriders on the confit object