added none_output.py and some file changes
LostColony w i p
fixing merge conflicts...