clean up rake file
Merge branch 'rake_tasks' into development