fixes some coffeescript
Merge branch 'master' of github.com:kshmir/ss-2013
fixes animations a bit