cleanup some code
Merge branch 'master' of ssh://github.com/jkelleyy/icpc_lib
fix more style stuff