Merge branch 'master' into summit

Conflicts:
	.pairs
	package.json
	spec/app/tokenized-buffer-spec.coffee
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/window.coffee
	src/atom-application.coffee
	static/root-view.less

.pairs

@@ -9,6 +9,8 @@ pairs:
   gt: Garen Torikian; garen
   mc: Matt Colyer; mcolyer
   bo: Ben Ogle; benogle
+  jr: Jason Rudolph; jasonrudolph
+  jl: Jessica Lord; jlord
 email:
   domain: github.com
 #global: true