Chris Heald:
	Allow for multi-token searches
	Initial commit. Woo.
