Merge remote-tracking branch 'upstream/master' into serializablecallable

Conflicts:
	setup.py
Whoops, pushed broken setup.py from merge

Not good at merging from my mac!
Merge branch 'serializablecallable' into cvpr2014

Conflicts:
	setup.py