mod'ing rakefile to support docker test
Merge branch 'develop'