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 '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.