Merge branch 'nathan-dev' into richmond-dev
merging in nathan and aarons latest changes
wiki api working - home page redirect when already logged in working - locations socrata call now strips out numbers for consitency
Merge branch 'richmond-dev' into nathan-dev