fixed horizon_rsis (its alive!), cleaned up older code
Merge branch 'master' of github.com:craig-corcoran/circle-world

Conflicts:
	rsis/features.py