Upgrade coffee-mode
Change coffeescript tab width
enable whitespace mode
merge