Merge remote-tracking branch 'origin/dev' into better-anchors

Conflicts:
	src/app/cursor.coffee
	src/app/editor.coffee

src/app/selection.coffee

@@ -97,7 +97,10 @@ class Selection
     @screenRangeChanged()
 
   selectWord: ->
-    @setBufferRange(@cursor.getCurrentWordBufferRange())
+    options = {}
+    options.wordRegex = /[\t ]*/ if @cursor.isSurroundedByWhitespace()
+
+    @setBufferRange(@cursor.getCurrentWordBufferRange(options))
     @wordwise = true
     @initialScreenRange = @getScreenRange()