Merges master
Merge pull request #173 from codeforamerica/mobile-refactor

Mobile refactor
Merge master