Update conditions
Merge branch 'master' of git@github.com:jschlitt84/TwitterGIStudy
Merge branch 'master' of git@github.com:jschlitt84/TwitterGIStudy
Merge branch 'master' of git@github.com:jschlitt84/TwitterGIStudy