Merge remote-tracking branch 'upstream/master' into cython/update-master

Conflicts:
	setup.py
	traits/ctraits.c
	traits/trait_types.py
Merge branch 'cython/validators' into cython/update-master
Initial implementation of Integer trait
Removed cython implementation of CTraitMethod, which is removed in master
Merge pull request #7 from sjagoe/cython/validators

Cython/validators
Merge pull request #5 from sjagoe/cython/update-master

Bring traits_cython in line with upstream master
Switch use of HasTraits.set to HasTraits.trait_set in tests