Merge commit 'bd2ec3e4c400b8222ec4805f400c382764c6b7e2'
Merge commit '8b0dddcb9506b3dc5c847ad905408380b0b3bf0e'
Junit enhancement
Merge pull request #72 from allenxwang/master

Junit enhancement
Adding scala examples and some cleanup.
Merge branch 'master' of github.com:Netflix/archaius