Merge new version into CfB repo

Since Random Hacks of Kindness, major changes have been made to the app. We've been working from @brucegarro's fork and think it best to work from the CfB repo.