[CB/CD][72668778] Updated README and Rakefile
Merge branch 'refs/heads/dev'

Conflicts:
	README.md
Merge pull request #1 from primedia/master

[CD/CB][72668778] Minor updates