Tweak osx.py. bump .emacs.d

dotfiles/cider/bootstrap.json

@@ -9,11 +9,13 @@
     "flash",
     "flux",
     "google-chrome",
+    "google-hangouts",
     "heroku-toolbelt",
     "iterm2",
     "java",
     "karabiner",
     "macpass",
+    "osxfuse",
     "seil",
     "slate",
     "spotify",
@@ -22,8 +24,7 @@
     "transmission",
     "virtualbox",
     "vlc",
-    "xquartz",
-    "google-hangouts"
+    "xquartz"
   ],
   "formulas": [
     "ack",

dotfiles/lib/shellrc/aliases.sh

@@ -1,5 +1,5 @@
 alias tmux="tmux -2"
-alias reload_tmux_conf="tmux source-file .tmux.conf"
+alias reload_tmux_conf="tmux source-file ~/.tmux.conf"
 alias tmux_cb_to_remote_cb='tmux saveb - | linux_nc_paste_to_remote_clipboard'
 alias timestamp='date +%s'
 alias fn='find . -name '

dotfiles/pylintrc

@@ -44,7 +44,7 @@ symbols=no
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=C0111,C0103,R0903
+disable=C0111,C0103,R0903,R0904
 
 
 [REPORTS]