Updated docs.
Imported improved parser from develop branch and fixed a broken test.
Updated changelog.
Bumped version to 1.0.4.
Merged changes from 1.0.4.

Conflicts:
	CHANGELOG.rst
	README.rst
	docs/index.rst
	mido/__init__.py
	mido/midifiles.py