Update to work with newer dye (as of 19/08/2103)

Mostly just updating localtasks to import from new locations.
Merge branch 'develop' into dye

* develop: (100 commits)
  Fix bug with empty list on action items tab
  Remove '$' from the '$form" variable name
  Make javascript work with internationalisation
  Change post css selector to allow for internationalisation.
  Change css selector to allow for internationalisation. Change comments to make them fit the code.
  Fix changes to dev_fasttests
  Remove changes to dev_fasttests
  Revert "Put selnium tests back in so that they're there."
  Revert "Put selnium tests back in so that they're there."
  Moved the minor edit box to the bottom of the form. Redmine #4447 Conflicts:
  Simplified organization list and replaced table layout. Redmine #4422
  Replace line breaks in organization list template with CSS.
  Fix bug with feedback watchers
  Remove a "magic number"
  Users can delete themselves on delete view
  Fix a spacing issue in the template
  A user can't make others leave an organisation
  It is possible quit organisations
  Put selnium tests back in so that they're there.
  Restore files to the state they were in before changing for selenium tests.
  ...
Update localfab to use new arguments
update to newer dye
Update localfab to use new dye deploy method

which does a lot of work on a copy of the working directory.
Merge branch 'develop' of git://github.com/aptivate/econsensus into develop

* 'develop' of git://github.com/aptivate/econsensus:
  Delete action item created in test
  Fix bugs.
  Fixed navigation bar display with reduced screen width.
  Fixed save and cancel buttons to always be at the bottom of the form.
Merge branch 'develop' of git://github.com/aptivate/econsensus into develop

* 'develop' of git://github.com/aptivate/econsensus:
  Add headers to stop auto-responders from replying
Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  Fix bugs caused by merge
  Horizontal spacing added between elements of the user list
  Removed unnecessary import.
  Organization options moved onto one line in preparation for groups.
  Make sequence of links to top-level flatpages into a list (ul)
  Minor code tidying in light of flatpages code review
  Rework in custom flatpages tag in light of code review
  Fixed display of comments to be wider in small screens. Redmine #4420
  Restyling of links to top-level flat pages
  Provide link to _all_ top-level flatpages, not just "about"
  Ensure Markdown is installed, as it is used to render flat pages
  Add entry point for flatpages: if admin has created an "about" flatpage then put a link to this at the bottom of all pages
  Ensure bullet lists in flatpages show up as such
  Enable use of flatpages app within econsensus. This allows pages to be created from the admin interface.

* commit '4bf5134570e1fe631dccd87326a080bfe5093827': (53 commits)
  Edit button is a consistent style across types of decision
  Include action items in CSV export
  Make display of action items more like decisions: - excerpt first sentence when listed - full content (with linebreaks) when displayed
  Add changes to action item snippet
  Change last action item column heading ("Decision" to "Parent Item")
  Fix bug in empty action items list
  Add tests for search
  Specify versions for search dependencies
  Remove global (non-organization based) search page
  Make search result pagination controllable much like decision list pagination
  Re-thinking of search: - Have a search "tab" containing search form (and results) - Search is always within the context of a single organization - Make search results look a bit more like decision lists
  Remove search form from nav bar
  Fix bug in one-branch ifcansearch
  When search is disabled, search form should be present but disabled (to avoid confusing devision_view_test.py)
  Added instructions to README for configuring search
  Refactor templates with respect to search form
  Allow search to be disabled entirely (and suppressed in the UI)
  Restrict search to user's organizations
  Require user to be logged in when searching
  Restyle search result page
  ...
Update to new version of dye
Move to next dye commit
Update to latest dye

- fab.py and tasks.py check if the virtualenv up to date
- a couple more fixes to new deploy dir structure
Merge branch 'develop' into notification_settings