Remove bundled decorator package
Merge pull request #1188 from ysitu/decorator

Remove bundled decorator package
Merge branch 'master' into setup

Conflicts:
	setup.py