Merge branch 'dustinblackman-master' into 0.9.3

Author: ryanoasis

plugin/webdevicons.vim

@@ -284,6 +284,7 @@ function! s:setDictionaries()
         \ 'psd'      : '',
         \ 'psb'      : '',
         \ 'ts'       : '',
+        \ 'tsx'      : '',
         \ 'jl'       : '',
         \ 'pp'       : ''
         \}