pin nose-exclude to 0.1.10, as 0.2.X has issues under py3:  https://bitbucket.org/kgrandis/nose-exclude/issue/10/test-failures-with-python-3
pin  to less than  0.2 in both setup.py  and tox.ini
fix an issue under pypy > 2.0 where attached_id will be a long
changes
push-me-pull-you fix for fix that broke py3 by fixing pypy
prep for 1.0
oops
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGES.txt
	setup.py
	tox.ini