Merge branch 'master' into production

README.md

@@ -20,6 +20,14 @@ to do things like:
 which will output a URL to share containing the contents of `cat something`'s
 STDOUT.  Check the README there for more details and usages.
 
+## Support
+
+Please consider paying what you feel this project is worth:
+
+<a href="https://www.stripeme.com/pay/1r2f">
+  <img alt="Pay" src="https://www.stripeme.com/pay.jpg" />
+</a>
+
 ## Tested Browsers
 
 * Firefox 8

static/application.js

@@ -168,7 +168,7 @@ haste.extensionMap = {
   lua: 'lua', pas: 'delphi', java: 'java', cpp: 'cpp', cc: 'cpp', m: 'objectivec',
   vala: 'vala', cs: 'cs', sql: 'sql', sm: 'smalltalk', lisp: 'lisp', ini: 'ini',
   diff: 'diff', bash: 'bash', sh: 'bash', tex: 'tex', erl: 'erlang', hs: 'haskell',
-  md: 'markdown', txt: '', coffee: 'coffee'
+  md: 'markdown', txt: '', coffee: 'coffee', json: 'js'
 };
 
 // Look up the extension preferred for a type