Add syntax highlighting to readme
Delete trailing space
Refer to former name in readme
Merge remote-tracking branch 'origin/master' into name-change

* origin/master:
  Delete trailing space
  Add syntax highlighting to readme

Conflicts:
	README.md