Merge pull request #9 from empowerchris/eldon

Eldon
added scopes, fixed nav, one nice join