Small cleanup, still trying to figure out how to get sliders to work
Merge branch 'master' of git://github.com/AaronBuxbaum/Prototype