Added package data.
Merge branch 'master' into 0.2.x

Fixes package data

Conflicts:
	setup.py
Fixed test case.
Fixed very minor bug that broke test case
Removed duplicated code.
Stylistic change to example.
Merge branch 'master' into 0.2.x