Merge branch 'master' of github.com:codeforamerica/brigade into mchung-fixed-exception-routing
Merge branch 'master' of heroku.com:brigade-staging into mchung-fixed-exception-routing
change OGI from advocate to work, improve OGI content
Merge branch 'master' of heroku.com:brigade-staging
Merge branch 'master' of heroku.com:brigade-staging into advocate-pivot
fix links
add sticker tool
fix sticker link
add link to meetups
Added Asheville GitHub
Merge pull request #120 from openAsheville/master

added Asheville Github
Merge branch 'master' of github.com:codeforamerica/brigade
Merge branch 'master' of github.com:codeforamerica/brigade into advocate-pivot
Merge pull request #121 from brigade-hrva/advocate-pivot

Advocate pivot
Merge branch 'master' of github.com:codeforamerica/brigade
Update Rails to 3.2.11
Merge branch 'master' of heroku.com:brigade
Switch the generic .ruby-version file
Bundle update rails