Finished some rewrites and fixed dependency issue
Merge branch 'master' of https://github.com/jackcook/aplo

Conflicts:
	aplo.py
Finished some rewrites and fixed a dependency issue