Merge branch 'master' of github.com:maxf130/dotfiles

diff --combined xinitrc
index 038a91443a966df376242581c901d1b898829efe,b936d6b4158888b2b8a54a8762df87b321563c41..6a2e74cd24f4da1b2be7ecbc01d88f7a8d4f4790
--- 1/xinitrc
--- 2/xinitrc
+++ b/xinitrc
@@@ -1,4 -1,4 +1,4 @@@
- #!/bin/sh
+ #!/bin/bash
  #
  # ~/.xinitrc
  #
@@@ -14,7 -14,8 +14,8 @@@ f
  
  
  # Load .Xresources
- [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+ xrdb -merge ~/.Xresources &> /dev/null
+ 
  
  # Set caps lock as control to avoid emacs pinky
  setxkbmap -option ctrl:nocaps
@@@ -23,7 -24,6 +24,7 @@@
  export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
  
  
 +feh --bg-scale ~/Pictures/background.jpg&
  
  
  # exec gnome-session