specify browserify v1.17.3 --Major version 2.x.x will not compile client.coffee via npm start
updated client to be compatible with most recent browserify
cleaned up '.coffee~' files
manual merge changes