diff --git a/.bash_aliases b/.bash_aliases
old mode 100755
new mode 100644
diff --git a/.bash_androidenv b/.bash_androidenv
new file mode 100644
index 0000000..e2ce223
--- /dev/null
+++ b/.bash_androidenv
@@ -0,0 +1,27 @@
+#
+# set the path to android executables
+#
+
+ANDROID_SDK_HOME='/Applications/AndroidStudio.app/sdk'
+JAVA_HOME='/Library/Java/JavaVirtualMachines/jdk1.7.0_55.jdk/Contents/Home'
+ANT_HOME='/Users/j3g/Applications/android-dev/ant-1.9.4'
+
+# binaries
+export JAVA_BIN=$JAVA_HOME/bin
+export ANT_BIN=$ANT_HOME/bin
+export PATH=$ANT_BIN:$JAVA_BIN:$PATH
+
+# used by build tools (ant)
+export JAVA_HOME=$JAVA_HOME
+export ANT_HOME=$ANT_HOME
+
+# used by ant scripts
+export ANDROID_SDK_HOME=$ANDROID_SDK_HOME
+export ANDROID_HOME=$ANDROID_SDK_HOME
+
+# set path to android tools
+export PATH=$ANDROID_SDK_HOME/build-tools/android-4.4.2:$PATH
+export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
+export PATH=$ANDROID_SDK_HOME/tools:$PATH
+
+alias ant="$ANT_BIN/ant"
\ No newline at end of file
diff --git a/.bash_crypto b/.bash_crypto
old mode 100755
new mode 100644
diff --git a/.bash_dev b/.bash_dev
old mode 100755
new mode 100644
diff --git a/.bash_history b/.bash_history
old mode 100755
new mode 100644
index 4e5140d..6fbbf15
--- a/.bash_history
+++ b/.bash_history
@@ -1,214 +1,3 @@
-git s
-pwd
-git s
-git ba
-git fetch
-git ba
-git s
-git cam 'netty 5.x conversion'
-git s
-ls xdoc/
-git ba
-git chb netty40
-pwd
-git s
-bit ba
-git ba
-ll
-pwd
-ll
-la
-git pull
-git fetch
-git ba
-git ls
-git ba
-git ch master
-git bdd netty40
-git bd netty40
-git ba
-git ch netty40
-git ba
-git s
-find . | grep .DS_Store
-find . | grep .DS_Store | xargs rm
-find . | grep .DS_Store
-git s
-ll
-cd src/main/java/
-ll
-pwd
-pwd
-cd ../../..
-ll
-cp ~/Downloads/ubuntu-14.04-server-amd64.iso.torrent .
-ll
-mv ubuntu-14.04-server-amd64.iso.torrent u.torrent
-ll
-pwd
-diskutil list
-ls /Volumes/
-lsof
-lsof | less
-ls /Volumes/
-sudo umount -f /Volumes/misc 
-sudo umount -f /Volumes/misc 
-su overlord
-ssh ssh@10.5.1.50
-ssh ssh@10.5.1.50
-ssh ssh@10.5.1.50
-ssh ssh@10.5.1.50
-ping 10.5.1.2
-ifconfig
-ssh 10.5.1.50
-ping 10.5.1.50
-ping 10.5.1.1
-ping 10.5.1.1
-ping 10.5.1.1
-ifconfig
-ping 10.5.1.1
-ping 10.5.1.50
-ping 10.5.1.50
-ping 10.5.1.1
-ping 10.5.1.1
-ifconfig
-ping 10.5.1.1
-ssh git.malloc.io
-ping git.malloc.io
-ping duh.malloc.io
-/Applications/Android\ Studio.app/Contents/MacOS/studio ; exit;
-echo $JAVA_HOME
-+
-ssh 10.5.1.50
-ifconfig
-ssh git.malloc.io
-whoami
-ping git.malloc.io
-ssh dev2.malloc.io
-clear
-pwd
-ls
-ls /Volumes/
-cd /Volumes/SSD_Stuff/
-l;s
-ls
-ll
-cd Videos/
-ll
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 3 -e .mkv -t
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 3 -e .mkv
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv -t
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv
-ls
-mkdir stupid
-cd stupid
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv -t
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv -t
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Other/The\ League/Season\ 5 -e .mkv
-cd ..
-HandBrakeCLI -v -i /Volumes/videos/Movies_Other/Friday\ \(1995\)/Friday\ \(1995\).mkv -o Friday.1995.mp4 -Z "Android Tablet"
-HandBrakeCLI -v -i /Volumes/videos/TV_Other/The\ League/Season\ 4/The\ League\ -\ S04E12\ -\ 720p\ BluRay\ X264-REWARD.mkv -o The.League.S04E12.720p.mp4 -Z "Android Tablet"
-ssh 10.5.1.50
-pwd
-python dev/python_sandbox/handbrake2.py 
-scp ~/dev/python_sandbox/handbrake.py 10.5.1.50:/zetabits/video/MobileDevices/TheLeague
-scp ~/dev/python_sandbox/handbrake.py 10.5.1.50:/zetabits/videos/MobileDevices/TheLeague
-ssh 10.5.1.50
-scp ~/dev/python_sandbox/handbrake2.py 10.5.1.50:/zetabits/videos/MobileDevices/TheLeague
-scp ~/dev/python_sandbox/handbrake2.py 10.5.1.50:/zetabits/videos/MobileDevices/TheLeague
-ls
-ssh 10.5.1.50
-ssh 10.5.1.50
-ssh 10.5.1.50
-ssh 10.5.1.50
-ssh 10.5.1.50
-ll
-ls scripts/
-ls dev/python_sandbox/
-ls /Volumes/
-cd /Volumes/SSD_Stuff/
-ls
-mkdir chima
-cd chima/
-python ~/dev/python_sandbox/handbrake.py
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Kids/Legends.of.Chima/ -e .mkv -t
-python ~/dev/python_sandbox/handbrake.py -d /Volumes/videos/TV_Kids/Legends.of.Chima/ -e .mkv
-ssh 10.5.1.50
-cd 
-ls
-su overlord
-ll /usr/local/bin
-ls /usr/local/
-ls /usr/local/Cellar/
-ls /usr/local/Cellar/gradle/
-ls /usr/local/Cellar/gradle/1.12/
-gradle -v
-ls
-cd dev
-cd python_sandbox/
-ls
-scp handbrake2.py 10.5.1.50:dev/scripts
-scp handbrake.py 10.5.1.50:dev/scripts
-scp handbrake.py 10.5.1.50:dev/scripts
-ssh 10.5.1.50
-which java
-jova
-java -version
-java
-pwd
-ls
-ls 3rdPartyLibs/
-pwd
-ll
-la
-ll
-git init
-git add .
-git s
-git cm 'init import'
-git s
-git l
-git ls
-git remote add origin git@git.malloc.io:j3g/pythonsandbox.git
-git push -u origin master
-git b
-git ba
-cd ../aa
-ls
-cd telegram/
-ls
-ls
-python parse.py 
-python parse.py  -f var/cache4-4-15-2014.db  -o newdata.csv
-ll
-ssh 10.5.1.50
-ssh 10.5.1.50
-cd /Applications/MultiFirefox.app
-cd /Applications/MultiFirefox.app
-cd /Applications/Utilities/Terminal.app
-adb devices
-ls
-cd 
-ll
-ls scripts/
-cat scripts/launch_android.sh 
-ll
-cat androidenv.sh 
-la /Applications/
-ll
-cat androidenv.sh 
-ls /Applications/android-dev/
-./androidenv.sh 
-adb devices
-source androidenv.sh 
-adb
-adb devices
-adb devices
-adb devices
-adb devices
-su overlord
-eixt
-exit
 cd 
 pwd
 cd /
@@ -498,3 +287,214 @@ virtualenv  -p /usr/local/bin/python fart
 source fart/bin/activate
 python --version
 ll
+cd 
+ll
+la
+cat .bash_tools
+cat .bash_androidenv 
+la
+mkdir backup
+cp .bash_* backup/
+cp .git* backup/
+cp .hgignore_global backup/
+less .bash_profile 
+git clone git@git.malloc.io:j3g/osxenv
+ll
+ll osxenv/
+la osxenv/
+ll
+cp osxenv/* .
+ll
+la
+ls osxenv/
+la osxenv/
+ll
+la
+la
+la osxenv/
+ls
+la
+git s
+mv osxenv/.git .
+la
+git s
+git l
+la
+cat .bash_profile 
+ls osxenv/
+la osxenv/
+cp osxenv/.bash_* .
+cp osxenv/.git* .
+cp osxenv/.hgignore_global .
+git s
+ll
+la
+git s
+la
+ls backup/
+la backup/
+la
+chmod 640 .bash_dev
+la
+pwd
+ll
+cd dev
+ls
+cd websockets/
+ls
+ll
+ls example_src/
+ls example_src/Java-WebSocket/
+ll
+ls uiwebsocket
+cd uiwebsocket
+ls
+ls server/
+ls server/libs/
+ls server/src
+ls
+ls client/
+ls
+ll
+la
+cat .git
+cat .gitignore 
+git l
+git r
+git remote add malloc git@git.malloc.io:j3g/uiwebsocket.git
+git push
+git push -u malloc master
+ll ~/.ssh/
+git push -u malloc master
+pwd
+ll
+cd pserver
+ls
+ll
+python server.py 
+pwd
+cd ..
+ll
+pwd
+cd ..
+ls
+mkdir source
+mv uiwebsocket source/
+ll
+mv example_src source/
+ll
+cd source/
+ll
+ll example_src/
+cd example_src/
+ll
+git clone https://github.com/Lawouach/WebSocket-for-Python.git
+ll
+ll WebSocket-for-Python/
+ll WebSocket-for-Python/docs/
+cd ..
+ll
+ll
+cd uiwebsocket/
+ll
+cd pserver/
+ll
+python server.py 
+python server.py 
+pwd
+cd ../..
+ll
+cd example_src/
+ll
+git clone https://github.com/tavendo/AutobahnPython.git
+pwd
+ll
+cd ..
+ll
+cd uiwebsocket/
+ll
+git s
+ll pserver/
+ll pserver
+git add pserver
+git s
+git cam 'sneakernet'
+git s
+git r
+git push malloc 
+git b
+git r
+bit ba
+git ba
+git l
+git b
+git b master
+git ch master
+git s
+git l
+pwd
+git r
+git l
+git ba
+git ch working
+git l
+git ba
+git r
+git l
+git pull malloc
+git pull working malloc
+git pull malloc/working
+git ba
+git fetch malloc
+git ba
+git b
+git r
+git push
+git push --set-upstream malloc working
+git ba
+git pull
+git pull malloc working
+git ba
+pwd
+cd ../../..
+ll
+cd undertowswirl/
+ll
+cd source/
+ll
+cd u
+cd uts
+ll
+la
+git r
+git l
+git s
+git b
+git chb working
+git ba
+git s
+git cam 'sneakernet'
+ll
+python uts.py test/test1.db 
+python uts.py -f test/test1.db 
+ll
+ll test1_2014-09-07_025549/
+ll test1_2014-09-07_025549/blobs/
+ll test1_2014-09-07_025549/blobs/messages/
+ll test1_2014-09-07_025549/blobs/messages/data/
+ll
+ll test1_2014-09-07_025549/
+less test1_2014-09-07_025549/messages.csv 
+git s
+git r
+pwd
+git ra malloc git@git.malloc.io:j3g/uts.git
+git r
+git push -u malloc master
+git push -u working master
+git push -u malloc working
+git ra
+git r
+git ba
+pwd
+virtualenv
diff --git a/.bash_mac b/.bash_mac
old mode 100755
new mode 100644
diff --git a/.bash_profile b/.bash_profile
old mode 100755
new mode 100644
index 595b6a2..fbd9475
--- a/.bash_profile
+++ b/.bash_profile
@@ -8,6 +8,7 @@ source ~/.bash_aliases
 source ~/.bash_mac
 source ~/.bash_crypto
 source ~/.bash_servers
+source ~/.bash_tools
 source ~/.bash_dev
 
 # prompt
diff --git a/.bash_servers b/.bash_servers
old mode 100755
new mode 100644
diff --git a/.bash_tools b/.bash_tools
new file mode 100644
index 0000000..c6d3ec9
--- /dev/null
+++ b/.bash_tools
@@ -0,0 +1,4 @@
+# 7zip install required (install: 'brew install p7zip')
+
+# 7zip encrypted, enables encryption of archive headers too
+alias 7ze='7z a -mhe=on -p'
diff --git a/.gitconfig b/.gitconfig
old mode 100755
new mode 100644
index 2e6eb2e..b6cc85d
--- a/.gitconfig
+++ b/.gitconfig
@@ -57,6 +57,7 @@
 	b  = branch
 	ba = branch -a
 	bd = branch -d
+	bdd = branch -D
 	br = branch -r
 	brd = branch -rd
 	bl = branch -lvv
diff --git a/.gitignore_global b/.gitignore_global
old mode 100755
new mode 100644
diff --git a/.hgignore_global b/.hgignore_global
old mode 100755
new mode 100644