Revert "changes"

This reverts commit 662413d361a097af6412d8fda060b662f24e8682, reversing
changes made to 6818274ca00d953b8c4ca84cf54945cd7c603774.
Merge earlier changes from bfox with my earlier changes
Merge with fixed branch
Revert "Merge with fixed branch"

This reverts commit 796d5c7c8ece780a8c03c8835243727da84d80de, reversing
changes made to c0ee4d789202493c74a4c77209b6877322ee43b5.
Merge branch 'master' of https://github.com/bfox1/SAO
Merge http://github.com/igraham/SAO