Fixing the link bug
Merge pull request #31 from swvist/master

Simple URL bug fix.
Reverse previous commit.
Added traling slash in settings-sample.py
Merge branch 'master' of github.com:hasgeek/funnel
Don't need organizations in funnel
Allow siteadmins to edit proposals
Merge branch 'master' of ../HasGeek/funnel