Merge pull request #40 from ambertunnell/ben_3

Ben 3
updated onclick for clock to pull updated uservars for articles, photos, tweets
Merge branch 'buttonpersist'
fixed bug intoroduced in last commit that appeared when user not logged in
fixed bug with punctuation in city or bigger thing by stripping it ut of both
fixed datacity html to not have punc. also removed from article search
removed punc strip from article search. couldnt find that it was better
fixes bug where no articles appeared if bigger thing was 2 words
Removes commented out code