don't move files which are already in the right place
Revert "Merge pull request #337 from NICTA/topic/scalaz-7.1-upgrade"

This reverts commit 3f5391af990ae080a464a521100c34a759735864, reversing
changes made to 1a004fe889a232ca8e8be811dfa612ee7eeb0c87.

Conflicts:
	project/dependencies.scala
fixed the renaming bug introduced by e956c7e