Checkpoint
Merge branch 'master' of https://github.com/tundra/plankton into where

Conflicts:
	src/c/plankton.hh
	tests/c/test_generic.cc
Added object type to plankton.
Whoops, that was a work in progress...