cleanup, fixed coffeelint and jade warnings
fixed doc merge conflicts