lots of changes please read log
Merge pull request #28 from smonette/rake_tasks

lots of changes please read log