Merge classes
Remove unnecessary js
Merge branch 'master' of ssh://github.com/tymmej/rower