cities/cohorts views
Merge branch 'develop' of git://github.com/esoergel/coderaising into develop
Merge pull request #3 from tkeemon/develop

Develop
Merge pull request #4 from Jmorton429/develop

cities/cohorts additions
minor tweaks to get all the commits together
added an OR to twitter stuff
remove update button
fixed twitter
Merge pull request #5 from brianjyee/feature/profiles

remove update button
Merge branch 'develop' of https://github.com/esoergel/coderaising into devserver
fuckin twitter...
added some permissions stuff to the projects
unapproved projects hidden in index.html from anon and non-staff users
added links to mentor and mentee profiles in project detail pages
added ability for non-anonymous user to apply to project through the project detail page. also fixed the project detail url regex to optionally accept the url slug as a parameter