Many things do not work properly after upgrading to ubuntu saucy.  This fixes several problem, but doesn't yet give a working environment.
Merge branch 'hotfix/add-project-bug' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop
Fixing locations filter on search page
Merge pull request #158 from kyriog/develop

Fixing locations filter on search page.  Seems good to me.
Merge branch 'develop' of github.com:ImaginationForPeople/imaginationforpeople into build_fixes
Additional fabfile improvements
Fix problems with django-wiki and our version of django-activity-stream
Remove obsolete workaround in fabfile now that everything is going to collectedstatic.  It could have caused problems.