* Add new ignore file.
* Fix readme.
Merge branch 'master' into 3.0-unstable

Conflicts:
	.gitignore
	README.md