Update README with new rake tasks
Use #desc so tasks are shown with rake -T
Merge branch 'master' of https://github.com/netflam/netflam into pr/5

Conflicts:
	README.md
Merge pull request #7 from netflam/pr/5

Merge branches.