Loads of error fixes and test imporvisation
Merge branch 'master' of github.com:skarbot/aetos

Conflicts:
	source/aetos/dfs.py