Merge branch 'master' into snippets

Conflicts:
	src/app/window.coffee

src/app/buffer.coffee

@@ -12,9 +12,6 @@ class Buffer
   lines: null
   path: null
 
-  @deserialize: (state, project) ->
-    project.open(state.path)
-
   constructor: (path) ->
     @id = @constructor.idCounter++
     @setPath(path)
@@ -26,9 +23,6 @@ class Buffer
     @undoManager = new UndoManager(this)
     @modified = false
 
-  serialize: ->
-    path: @getPath()
-
   getPath: ->
     @path