fixes so debugger does not confuse X.cpp and Scout/X.cpp
Merge branch 'overhaul' of darwin:scout into overhaul