Reindent
Remove tern.js hack
Overwrite server methods to work with tern