adding rake tasks
merge with mater
Merge branch 'master' into mtaylor