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.