manual merge of #431 due to minor conflicts in some of the js files
rebuild with coffeescript 1.6.2 and source maps