Release 0.1.1-r2
Merge branch 'master' of github.com:jlinn/pylastica

Conflicts:
	setup.py