moar stuff
osx fixes
Merge remote-tracking branch 'origin/louise' into kensstuff

Conflicts:
	MainApplication.cpp
	MainApplication.h
	caltrain_runner.pro
working version of trains