update rake tasks
Merge branch 'master' into rake_update
Merge pull request #5 from jlambert121/rake_update

update rake tasks