74 files changed, 1230 insertions, 293 deletions
diff --git a/.gitignore b/.gitignore
index b2ebdc11..4a3cb30c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ a.out
 /ovh/soapi/SOAPpy
 /Reaktor/IRC/irclib.py
 /Reaktor/public_commands/*
+/ship/out
diff --git a/sandbox/27c3_ticket_grabber/mechanize_tickets.py b/.graveyard/27c3_ticket_grabber/mechanize_tickets.py
index 1f12a996..1f12a996 100644
--- a/sandbox/27c3_ticket_grabber/mechanize_tickets.py
+++ b/.graveyard/27c3_ticket_grabber/mechanize_tickets.py
diff --git a/sandbox/DNA/README.md b/.graveyard/DNA/README.md
index 9de84746..9de84746 100644
--- a/sandbox/DNA/README.md
+++ b/.graveyard/DNA/README.md
diff --git a/sandbox/DNA/linux/LICENSE b/.graveyard/DNA/linux/LICENSE
index 94a9ed02..94a9ed02 100644
--- a/sandbox/DNA/linux/LICENSE
+++ b/.graveyard/DNA/linux/LICENSE
diff --git a/sandbox/DNA/linux/Makefile b/.graveyard/DNA/linux/Makefile
index 2ed4c9fb..2ed4c9fb 100644
--- a/sandbox/DNA/linux/Makefile
+++ b/.graveyard/DNA/linux/Makefile
diff --git a/sandbox/DNA/linux/README.md b/.graveyard/DNA/linux/README.md
index 0b6885e2..0b6885e2 100644
--- a/sandbox/DNA/linux/README.md
+++ b/.graveyard/DNA/linux/README.md
diff --git a/sandbox/DNA/linux/TODO b/.graveyard/DNA/linux/TODO
index fd0d927f..fd0d927f 100644
--- a/sandbox/DNA/linux/TODO
+++ b/.graveyard/DNA/linux/TODO
diff --git a/sandbox/DNA/linux/krebs.c b/.graveyard/DNA/linux/krebs.c
index df319c63..df319c63 100644
--- a/sandbox/DNA/linux/krebs.c
+++ b/.graveyard/DNA/linux/krebs.c
diff --git a/sandbox/README.md b/.graveyard/README.md
index fbf92cd9..fbf92cd9 100644
--- a/sandbox/README.md
+++ b/.graveyard/README.md
diff --git a/sandbox/cobra/README.md b/.graveyard/cobra/README.md
index f9bb8026..f9bb8026 100644
--- a/sandbox/cobra/README.md
+++ b/.graveyard/cobra/README.md
diff --git a/sandbox/cobra/hello/index.sh b/.graveyard/cobra/hello/index.sh
index df2dea7c..df2dea7c 100644
--- a/sandbox/cobra/hello/index.sh
+++ b/.graveyard/cobra/hello/index.sh
diff --git a/sandbox/cobra/index.sh b/.graveyard/cobra/index.sh
index 1118a823..1118a823 100755
--- a/sandbox/cobra/index.sh
+++ b/.graveyard/cobra/index.sh
diff --git a/sandbox/hyper/README.md b/.graveyard/hyper/README.md
index d8fe9d67..d8fe9d67 100644
--- a/sandbox/hyper/README.md
+++ b/.graveyard/hyper/README.md
diff --git a/sandbox/hyper/influx/http/index.js b/.graveyard/hyper/influx/http/index.js
index 346dde3b..346dde3b 100755
--- a/sandbox/hyper/influx/http/index.js
+++ b/.graveyard/hyper/influx/http/index.js
diff --git a/sandbox/hyper/process/Makefile b/.graveyard/hyper/process/Makefile
index bbc1c2fb..bbc1c2fb 100644
--- a/sandbox/hyper/process/Makefile
+++ b/.graveyard/hyper/process/Makefile
diff --git a/sandbox/hyper/process/main.go b/.graveyard/hyper/process/main.go
index 214dade9..214dade9 100644
--- a/sandbox/hyper/process/main.go
+++ b/.graveyard/hyper/process/main.go
diff --git a/sandbox/hyper/process/spawn b/.graveyard/hyper/process/spawn
index 65e94d86..65e94d86 100755
--- a/sandbox/hyper/process/spawn
+++ b/.graveyard/hyper/process/spawn
diff --git a/sandbox/hyper/process/src/hyper/process/Makefile b/.graveyard/hyper/process/src/hyper/process/Makefile
index 7ecda716..7ecda716 100644
--- a/sandbox/hyper/process/src/hyper/process/Makefile
+++ b/.graveyard/hyper/process/src/hyper/process/Makefile
diff --git a/sandbox/hyper/process/src/hyper/process/process.go b/.graveyard/hyper/process/src/hyper/process/process.go
index 18cf55fb..18cf55fb 100644
--- a/sandbox/hyper/process/src/hyper/process/process.go
+++ b/.graveyard/hyper/process/src/hyper/process/process.go
diff --git a/sandbox/hyper/process/test/bc.json b/.graveyard/hyper/process/test/bc.json
index 5b3b0721..5b3b0721 100644
--- a/sandbox/hyper/process/test/bc.json
+++ b/.graveyard/hyper/process/test/bc.json
diff --git a/sandbox/hyper/sink/index.js b/.graveyard/hyper/sink/index.js
index b556b88d..b556b88d 100644
--- a/sandbox/hyper/sink/index.js
+++ b/.graveyard/hyper/sink/index.js
diff --git a/sandbox/json/sh/json.sh b/.graveyard/json/sh/json.sh
index 79f8529a..79f8529a 100755
--- a/sandbox/json/sh/json.sh
+++ b/.graveyard/json/sh/json.sh
diff --git a/sandbox/json/sh/test.json b/.graveyard/json/sh/test.json
index 9b4c6312..9b4c6312 100644
--- a/sandbox/json/sh/test.json
+++ b/.graveyard/json/sh/test.json
diff --git a/sandbox/meta/bin/update b/.graveyard/meta/bin/update
index 9b2289ad..9b2289ad 100755
--- a/sandbox/meta/bin/update
+++ b/.graveyard/meta/bin/update
diff --git a/sandbox/meta/install b/.graveyard/meta/install
index 07096b34..07096b34 100755
--- a/sandbox/meta/install
+++ b/.graveyard/meta/install
diff --git a/punani/Makefile b/.graveyard/punani/Makefile
index f444b1fc..f444b1fc 100644
--- a/punani/Makefile
+++ b/.graveyard/punani/Makefile
diff --git a/punani/README.md b/.graveyard/punani/README.md
index 1b70eab7..1b70eab7 100644
--- a/punani/README.md
+++ b/.graveyard/punani/README.md
diff --git a/punani/autostart/punani-debian b/.graveyard/punani/autostart/punani-debian
index 53db0336..53db0336 100755
--- a/punani/autostart/punani-debian
+++ b/.graveyard/punani/autostart/punani-debian
diff --git a/punani/bin/punani b/.graveyard/punani/bin/punani
index 23ba5e00..23ba5e00 100755
--- a/punani/bin/punani
+++ b/.graveyard/punani/bin/punani
diff --git a/punani/bot/__init__.py b/.graveyard/punani/bot/__init__.py
index 4944bba0..4944bba0 100755
--- a/punani/bot/__init__.py
+++ b/.graveyard/punani/bot/__init__.py
diff --git a/punani/db/punani b/.graveyard/punani/db/punani
index e5d1f383..e5d1f383 100644
--- a/punani/db/punani
+++ b/.graveyard/punani/db/punani
diff --git a/punani/doc/releases b/.graveyard/punani/doc/releases
index 98c4ea82..98c4ea82 100644
--- a/punani/doc/releases
+++ b/.graveyard/punani/doc/releases
diff --git a/punani/host/dist/arch/getsize b/.graveyard/punani/host/dist/arch/getsize
index a2ef8f95..a2ef8f95 100755
--- a/punani/host/dist/arch/getsize
+++ b/.graveyard/punani/host/dist/arch/getsize
diff --git a/punani/index.py b/.graveyard/punani/index.py
index ff483d37..ff483d37 100755
--- a/punani/index.py
+++ b/.graveyard/punani/index.py
diff --git a/sandbox/roboctl/index.js b/.graveyard/roboctl/index.js
index ac92c969..ac92c969 100644
--- a/sandbox/roboctl/index.js
+++ b/.graveyard/roboctl/index.js
diff --git a/sandbox/roboctl/lib/irc.js b/.graveyard/roboctl/lib/irc.js
index 5f904a74..5f904a74 100644
--- a/sandbox/roboctl/lib/irc.js
+++ b/.graveyard/roboctl/lib/irc.js
diff --git a/shell/etc/ipt/ipv4-shield-1.rules b/.graveyard/shell/etc/ipt/ipv4-shield-1.rules
index c879311d..c879311d 100644
--- a/shell/etc/ipt/ipv4-shield-1.rules
+++ b/.graveyard/shell/etc/ipt/ipv4-shield-1.rules
diff --git a/sandbox/tinc_multicast/retiolum b/.graveyard/tinc_multicast/retiolum
index 1d6b775f..1d6b775f 100755
--- a/sandbox/tinc_multicast/retiolum
+++ b/.graveyard/tinc_multicast/retiolum
diff --git a/sandbox/tinc_multicast/retiolum.py b/.graveyard/tinc_multicast/retiolum.py
index 8cf57471..8cf57471 100755
--- a/sandbox/tinc_multicast/retiolum.py
+++ b/.graveyard/tinc_multicast/retiolum.py
diff --git a/sandbox/zoneminder/Makefile b/.graveyard/zoneminder/Makefile
index 27302715..27302715 100644
--- a/sandbox/zoneminder/Makefile
+++ b/.graveyard/zoneminder/Makefile
diff --git a/sandbox/zoneminder/zmdc.pl-LD_PRELOAD.patch b/.graveyard/zoneminder/zmdc.pl-LD_PRELOAD.patch
index b00fc673..b00fc673 100644
--- a/sandbox/zoneminder/zmdc.pl-LD_PRELOAD.patch
+++ b/.graveyard/zoneminder/zmdc.pl-LD_PRELOAD.patch
diff --git a/sandbox/zoneminder/zoneminder.conf b/.graveyard/zoneminder/zoneminder.conf
index 1eec6fd9..1eec6fd9 100644
--- a/sandbox/zoneminder/zoneminder.conf
+++ b/.graveyard/zoneminder/zoneminder.conf
diff --git a/.travis.yml b/.travis.yml
index e62f843f..12f6de4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,15 @@
 language: c
 notifications:
-    irc: "chat.freenode.net#krebs_incoming"
-
-script: "! ( make -C util test | grep -q '^not ok' )"
+  irc: "chat.freenode.net#krebs_incoming"
+  on_success: change
+  on_failure: always
+  template:
+    - "painload/%{branch} %{commit} %{author}: %{message} %{build_url}"
+script: "! ( make -C util test | grep '^not ok' )"
 before_install:
   - sudo apt-get install bc -qq
   - sudo apt-get install python -qq
+  - sudo apt-get install w3m -qq
 branches:
     only:
         - master
diff --git a/cholerab/tahoe/brick_installation b/cholerab/tahoe/brick_installation
index b319393b..c8a10cd0 100644
--- a/cholerab/tahoe/brick_installation
+++ b/cholerab/tahoe/brick_installation
@@ -1,18 +1,44 @@
-#?/bin/sh
-# Tahoe installation
+#? /bin/sh
+
+## Tahoe Brick Installation (Arch Linux)
 pacman -S python2 python2-pip net-tools
 pip2 install pyasn1 zfec pycrypto zbase32 pycryptopp twisted
 pip2 install allmydata-tahoe
 
-# tahoe configuration
+## Tahoe Brick Installation (Arch Linux / Expert Mode^_^)
+# if the above breaks for some reason, but you basically know what you're
+# doing, then you could try something like this:
+pip2 uninstall `pip2 list | awk '{print$1}'`
+yaourt -S --asdeps --noconfirm net-tools python2 python2-zope-interface \
+    twisted python2-pyasn1 python2-crypto pycryptopp nevow python2-foolscap \
+    python2-simplejson zfec python2-pyopenssl pyutil python2-argparse zbase32 \
+    python2-mock python2-setuptools
+yaourt -S --noconfirm tahoe-lafs
+
+## Tahoe Brick Configuration
 mkdir /opt/tahoe
 tahoe create-node /opt/tahoe
 useradd tahoe -d /opt/tahoe
+chown -R tahoe: /opt/tahoe
+
 # change