Fix Rakefile generation to avoid circular dependency of tasks
Merge pull request #487 from untidy-hair/fix_rakefile

Fix Rakefile generation to avoid circular dependency of tasks