diff --git a/nix.org b/nix.org
index 936d0f9..05d0d5c 100644
--- a/nix.org
+++ b/nix.org
@@ -12,12 +12,25 @@ let
   pkgs = import <nixpkgs> {};
 in
 {
-
   packageOverrides = pkgs: with pkgs;
   let in rec {
+    custom-pybugz = with python34Packages; buildPythonPackage rec {
+      name = "pybugz-${version}";
+      version = "0.13";
+      src = pkgs.fetchgit {
+        url = https://github.com/williamh/pybugz.git;
+        rev = "4dec396d43061c1def9aa19601c89c8aa00742b3";
+        sha256 = "1s21jma83cyynmv3696hbrgy0d3sq4j027iplhnw22q2237bk1xd";
+      };
+      # TODO: Fix this, something to do with how its using unittest
+      doCheck = false;
+      buildInputs = [ pkgs.glibcLocales ];
+      propagatedBuildInputs = [ six ];
+    };
     custom-pinentry = pinentry.override { gtk2 = null; qt4 = null; ncurses = null; };
-    custom-gnupg = gnupg.override { x11Support = false; };
     custom-youtube-dl = python27Packages.youtube-dl.override { pandoc = null; };
+    # 3 unit tests fail on both 27 pylint and 35 pylint, so ignore it
+    custom-pylint = python35Packages.pylint.override { doCheck = false; };
 
     custom-git = git.override {
       pythonSupport = false;
@@ -30,110 +43,114 @@ in
       name = "default";
       ignoreCollisions = true;
       paths = [
-        ansible
         ack
+        ansible
         aria
-        iperf
+        aspell
+        aspellDicts.en
+        bazaarTools
         cacert
-        curl
         clang
         clang-analyzer
+        cloc
+        cscope
         ctags
-        diffutils
-        patchutils
+        curl
         custom-git
-        gitAndTools.gitFull
-        gitAndTools.git-extras
-        bazaarTools
-        mercurial
-        subversionClient
-        gist
-        mercurial
+        custom-pinentry
+        custom-pybugz
+        custom-pylint
+        custom-youtube-dl
+        diffutils
         docbook5
-        entr
+        duply
         emacs
+        entr
+        gcc
+        gdbm
+        ghostscript
+        gist
+        gitAndTools.git-extras
+        gitAndTools.gitFull
+        gnumake
         gnupg
         gnupg1compat
         gnutar
-        gnumake
-        sloccount
-        cloc
-        less
-        llvm
-        multitail
-        rlwrap
-        gdbm
-        mosh
+        graphviz-nox
+        haskellPackages.ShellCheck
+        haskellPackages.bake
+        haskellPackages.cabal-dependency-licenses
+        haskellPackages.ghc-core
+        haskellPackages.ghc-mod
+        haskellPackages.hasktags
+        haskellPackages.hindent
+        haskellPackages.hoogle
+        haskellPackages.hspec
+        haskellPackages.idris
+        haskellPackages.intero
+        haskellPackages.network
+        haskellPackages.pandoc
+        haskellPackages.shake
+        haskellPackages.stack
         htop
         imagemagick
+        iperf
+        jq
         keychain
-        silver-searcher
-        aspell
-        aspellDicts.en
+        lastpass-cli
+        less
+        llvm
+        mercurial
+        moreutils
+        mosh
+        multimarkdown
+        multitail
+        mutt
+        mr
+        nox
         openssl
-        custom-pinentry
-        poppler_utils
-        ghostscript
+        p7zip
+        patchutils
         pbzip2
         pigz
-        pv
+        pixz
         pkgconfig
+        poppler_utils
         postgresql
+        pv
+        python27Packages.bugzilla
+        python27Packages.flake8
+        python27Packages.howdoi
+        python27Packages.pip
+        python27Packages.pyflakes
+        python27Packages.virtualenv
         readline
+        rlwrap
         rsync
+        rtags
+        gmp
+        silver-searcher
+        sloccount
         sqlite
-        tmux
+        sshpass
+        subversionClient
         texlive.combined.scheme-full
+        tmux
         tree
-        wget
-        wakelan
+        unrar
         unzip
         upx
-        xz
-        multimarkdown
-        jq
-        p7zip
-        unrar
+        wakelan
         watch
-        nox
-        graphviz-nox
-        mutt
-        duply
-        lastpass-cli
-        custom-youtube-dl
-        python27Packages.bugzilla
-        python27Packages.howdoi
-        python27Packages.pyflakes
-        python27Packages.flake8
-        python27Packages.virtualenv
-        python27Packages.pip
-        python27Packages.pylint
-        haskellPackages.bake
-        haskellPackages.cabal-dependency-licenses
-#        haskellPackages.cabal-install
-        haskellPackages.ghc-core
-        haskellPackages.ghc-mod
-        haskellPackages.hasktags
-        haskellPackages.hindent
-        haskellPackages.hoogle
-        haskellPackages.hspec
-        haskellPackages.pandoc
-        haskellPackages.shake
-        haskellPackages.idris
-        haskellPackages.ShellCheck
-        haskellPackages.stack
-      ] ++ stdenv.lib.optionals stdenv.isLinux [
-        # some of these are broken on osx, fix them
-        rtags
-        cscope
-        gcc
-# disabled for now
+        wget
+        xz
+# If I ever come up with some linux only stuff or figure out xhyve
+#      ] ++ stdenv.lib.optionals stdenv.isLinux [
 #      ] ++ stdenv.lib.optionals stdenv.isDarwin [
-#        xhyve        compiles normally, figure out hypervisor framework issue
+#        xhyve
       ];
     };
   };
   allowUnfree = true;
-  allowBroken = true;
 }
 #+END_SRC