+ server api
Merge branch 'master' of https://github.com/c41x/dot.emacs