Merge branch 'activity' into user-activity

Including most recent changes, lookupUser and bounceUser
activities views changes to the user-activity branch
querying the foursquare venues database
show page stats
trying to merge
trying to merge
trying to merge
Merge branch 'master' into QA-branch
fixed all tests
welcome email done
can't get agenda to work, do not merge this branch
historic weather search and foursquare location search functioning
Merge pull request #6 from RJFryman/email

welcome email done
changes to show page
no meaningful changes
added a few tests
fixed up login page
many more tests
fix tests
fix travis