Merge pull request #17 from schilit/master

Lint warnings
Merge branch 'master' of https://github.com/google/uribeacon