add ensime
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
bug fix for javadoc
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
support customized java options for master, worker, executor, repl shell
Merge branch 'mesos'
Merge branch 'mesos'
Merge branch 'mesos'
Merge pull request #468 from haitaoyao/master

support customized java options for Master, Worker, Executor, and Repl