Merge branch 'master' of github.com:agapered/burrow

Conflicts:
	README.rdoc
Updated gitignore.