Merge changes from master

diff --cc Makefile
Simple merge

diff --cc TODO.md
index bed34eca3d80d16c1b3d5c866bfd6353f488f947,448a7c80280a9096a6470acf7becabbc4d1bd2cd..d3ee0344e0bb787646b8ae54eddff48a0711ca52
--- 1/TODO.md
--- 2/TODO.md
+++ b/TODO.md
@@@ -31,7 -31,7 +30,8 @@@ The Future
  
  # Auxillary Programs
  
 -* Acme-like window manager
 +* Visual diff tool
  * Win-like terminal emulator
  * File browser
 +* Acme-like window manager
+ 

diff --cc inc/x11.h
index e875b1387de374d58f2d0da207c4e4285e92b699,1abd4fb327838e0140eb8fcb15add5e1a48c5270..604d2153c0554196d7480038d5df6d94bc37f5a6
--- 1/inc/x11.h
--- 2/inc/x11.h
+++ b/inc/x11.h
@@@ -147,5 -141,3 +147,6 @@@ void x11_font_getglyph(XFont font, XGly
  size_t x11_font_getglyphs(XGlyphSpec* specs, const XGlyph* glyphs, int len, XFont font, int x, int y);
  void x11_draw_glyphs(int fg, int bg, XGlyphSpec* glyphs, size_t nglyphs);
  void x11_draw_utf8(XFont font, int fg, int bg, int x, int y, char* str);
 +bool x11_getsel(int selid, void(*cbfn)(char*));
 +bool x11_setsel(int selid, char* str);
++

diff --cc xedit.c
index 9f7602b35590c0c12c5113e76493cbd48f8b0f1d,5349ee855a5d60216c320359ec7bb602d12b1a8f..f20b921df111365f498ba547176919acfa303764
--- 1/xedit.c
--- 2/xedit.c
+++ b/xedit.c
@@@ -179,12 -179,16 +179,14 @@@ static KeyBinding Bindings[] = 
  
  /* External Commands
   *****************************************************************************/
+ /* The shell: Filled in with $SHELL. Used to execute commands */
+ static char* ShellCmd[] = { NULL, "-c", NULL, NULL };
+ 
  #ifdef __MACH__
  static char* CopyCmd[]  = { "pbcopy", NULL };
 -static char* PasteCmd[] = { "pbpaste", NULL };
  #else
  static char* CopyCmd[]  = { "xsel", "-bi", NULL };
 -static char* PasteCmd[] = { "xsel", "-bo", NULL };
  #endif
- static char* ShellCmd[] = { "/bin/sh", "-c", NULL, NULL };
  static char* PickFileCmd[] = { "xfilepick", ".", NULL };
  static char* PickTagCmd[] = { "xtagpick", "tags", NULL, NULL };
  static char* OpenCmd[] = { "xedit", NULL, NULL };