Add more tests for Option/Map/Multibinder

* Add missing matchers to SetProviderSpec
Update ScalaTest
Add reserved word gotcha
Merge pull request #38 from tsuckow/feature/beta5changes

Feature/beta5changes