Merge pull request #78 from gorzell/master

Couple of quick fixes.
Merge branch 'master' of github.com:Netflix/archaius