code cleanup
merge latest code.
add simple persona login.
fix conflicts.
Merge pull request #29 from ryanermita/feature/use-persona-as-login-system

Feature/use persona as login system