diff --git a/.bash_androidenv b/.bash_androidenv
index e2ce223..f609e54 100644
--- a/.bash_androidenv
+++ b/.bash_androidenv
@@ -3,8 +3,8 @@
 #
 
 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'
+JAVA_HOME='/Library/Java/JavaVirtualMachines/jdk1.8.0_20.jdk/Contents/Home'
+#ANT_HOME='/Users/j3g/Applications/android-dev/ant-1.9.4'
 
 # binaries
 export JAVA_BIN=$JAVA_HOME/bin
@@ -13,7 +13,7 @@ export PATH=$ANT_BIN:$JAVA_BIN:$PATH
 
 # used by build tools (ant)
 export JAVA_HOME=$JAVA_HOME
-export ANT_HOME=$ANT_HOME
+#export ANT_HOME=$ANT_HOME
 
 # used by ant scripts
 export ANDROID_SDK_HOME=$ANDROID_SDK_HOME
diff --git a/.bash_history b/.bash_history
index 6fbbf15..0373bf6 100644
--- a/.bash_history
+++ b/.bash_history
@@ -1,355 +1,3 @@
-cd 
-pwd
-cd /
-ll
-find -name "bitcasa"
-man find
-find -iname "bitcasa"
-find . -iname "bitcasa"
-cd 
-cd Music/Music\ Converter/
-ll
-cp /Volumes/videos/nzb/completed/Iggy_Azalea-The_New_Classic-Limited_Deluxe_Edition-CD-FLAC-2014-PERFECT/* .
-ll
-ffmpeg -i 001-iggy_azalea-walk_the_line.flac -f mp3 -ab 256000 001-iggy_azalea-walk_the_line.mp3
-ll
-(for FILE in *.flac ; do ffmpeg -i "$FILE" -f mp3 -ab 256000 "`basename "$FILE" .flac`.mp3" || break; done)
-(for FILE in *.flac ; do ffmpeg -i "$FILE" -f mp3 -ab 256000 "`basename "$FILE" .flac`.mp3" || break; done)
-(for FILE in *.flac ; do ffmpeg -i "$FILE" -f mp3 -ab 256000 "`basename "$FILE" .flac`.mp3" || break; done)
-ll
-ll *.mp3
-mv *.flac /Volumes/SSD_Stuff/music/Iggy_Azalea/The_New_Classic/
-ll
-which java
-ll /usr/bin/java
-java --version
-java -version
-which java
-ll /System/Library/Frameworks/JavaVM.framework/Versions
-ls /System/Library/Java/
-ls /System/Library/Java/Support/
-ls /System/Library/Java/Support/CoreDeploy.bundle/
-ls /System/Library/Java/Support/CoreDeploy.bundle/Contents/
-ls /System/Library/Java/Support/CoreDeploy.bundle/Contents/Java/
-cd 
-ll
-cat androidenv.sh 
-ls /Applications/android-dev/
-ll /Applications/android-dev/
-/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java
-/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java -version
-ll /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java -version
-alias
-unalias java
-alias
-java -version
-which java
-which gradle
-ll /Applications/android-dev/
-set
-set | grep JAVA
-which java
-set JAVA_HOME=/Applications/android-dev/jdk1.7.0_17/Contents/Home
-ls ~
-la ~
-ls ~/AndroidStudioProjects/
-ll ~/AndroidStudioProjects/
-ll ~/.android/
-adb'
-
-
-adb
-ls
-source androidenv.sh 
-and
-adb
-adb devices
-pwd
-ll
-gradle --version
-svn
-cd dev
-ls
-cd picseal/
-ls
-cd research/
-ls
-cd source/
-ls
-uname -a
-ssh 10.5.1.50
-ssh 10.5.1.50
-pmset displaysleepnow
-alias
-ls
-cd dev
-ls ../scripts/
-ls scir
-ls cri
-ls scripts/
-ls
-ll
-adb
-less androidenv.sh 
-cat androidenv.sh 
-less androidenv.sh 
-pwd
-cd dev
-ll
-cd websockets/
-ll
-ls UIWebSockets/
-ll UIWebSockets/
-ll
-ll UIWebSockets/
-git r
-pwd
-ll
-mkdir source
-mv UIWebSockets source/
-mv example_src source/
-ll
-cd source
-ll
-cd UIWebSockets/
-ll
-git s
-git b
-git r
-git ra
-git ra malloc git@git.malloc.io:j3g/uiwebsocket.git
-git r
-git s
-git l
-git add client/css/styles_OLD.css 
-git s
-git l
-git r
-git 
-git b
-git cam 'new cosmetic changes'
-git s
-git push bb
-git r
-git l
-git fetch malloc
-git b
-git ba
-git b merging
-git b
-git r
-git ch malloc/working
-git chb malloc/working
-git b
-git ba
-git l
-git ch merging
-git ba
-git ch malloc/working
-git ba
-git chb mg
-git ba
-git merge master
-git s
-git l
-git r
-git ba
-git ch working
-git merge mg
-git ba
-git push malloc
-ll
-cd pserver/
-ls
-pyton server.py 
-python server.py 
-pwd
-cd /User/j3g/dev/
-ll
-cd /Users/j3g/dev/
-ll
-mkdir undertowswirl
-cd undertowswirl/
-ls
-mkdir source
-cd source/
-mkdir uts
-ll
-git clone git@git.malloc.io:j3g/uts.git
-ll
-cd uts
-ll
-pwd
-ll
-mkdir gui
-ls
-cd gui
-ll
-which python
-python --version
-which python
-python --version
-la
-ls .cups
-ls .cups/
-git init
-git s
-git add .bash_*
-git s
-git add androidenv.sh 
-git add .gitconfig 
-git add .gitignore_global 
-git s
-git add .hgignore_global 
-git s
-git ra malloc git@git.malloc.io:j3g/osxenv.git
-git r
-git b
-git s
-git cam 'init import'
-git b
-git push -u malloc master
-git s
-echo $jdkhome
-git s
-su overlord
-cd 
-ll
-la
-cat .bash_aliases 
-cat .bash_mac 
-alias
-which java
-java --version
-la
-vi .bash_mac
-ll
-su overlord
-exit
-which python
-python --version
-which pip
-exit
-ll
-cd dev/undertowswirl/
-ll
-cd source/uts/gui/
-l
-ll
-pip
-easy_install pip
-pwd
-cd ../../..
-ll
-alias
-ll
-virtualenv pvirtenv
-ll
-pip list
-virtualenv
-ll
-ll pvirtenv/
-ll
-ll pvirtenv/bin/
-cd 
-git s
-git add .bash_dev
-git s
-la
-chmod 740 .bash_dev
-la
-git s
-git cam 'added support for brew binaries'
-git l
-git s
-git r
-git b
-git push
-which python
-python --version
-pwd
-ll
-cd dev
-ll
-which virtualenv
-virtualenv testing
-ls
-cd testing
-ll
-source bin/activate
-python --version
-pip list
-which virtualenv
-virtualenv
-source bin/activate
-cd ..
-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
@@ -498,3 +146,355 @@ git r
 git ba
 pwd
 virtualenv
+cd 
+ls
+cd Downloads/
+ls
+cd /Volumes/D1/downloads/
+ls
+subl get-pip.py 
+subl3 get-pip.py 
+ls
+cd 
+git s
+pwd
+cd dev/undertowswirl/source/
+ll
+virtualenv pvirtenv
+ls
+source pvirtenv/bin/activate
+pip list
+pip install yolk
+yolk -l
+ll
+pip install Twisted
+pip install TwistedWebsocket
+ll
+cd uts/gui
+ll
+python server/tserver.py 
+pwd
+cd ..
+ls
+la
+git r
+git l
+git s
+git b
+git ch master
+git s
+git b
+git l
+git reset --hard HEAD~1
+git l
+git r
+git b
+git pull
+ll
+git s
+ls gui
+la
+git l
+ls gui
+ls gui/server
+ls gui/client
+rm -rf gui/server
+rm -rf gui/client
+git s
+git rm .DS_Store 
+rm .DS_Store 
+rm gui/.DS_Store 
+git s
+la
+git pull
+python uts.py -f test/test1.db -g
+git pull
+git l
+ls
+rm -rf test1_2014-09-07_025549/
+ll
+python uts.py
+python uts.py -f test/test1.db -g
+python uts.py -f test/test1.db
+python uts.py -f test/test1.db -g
+python uts.py -f test/test1.db -g
+ps --help
+man df
+man ls
+alias
+pwd
+ll
+pwd
+cd ..
+ll
+pwd
+cd ..
+ll
+pwd
+cd source/
+ll
+pwd
+cd uts/
+ll
+git s
+git r
+git ba
+git r
+git pull
+ll
+pwd
+pwd
+ls ..
+ls ../..
+pwd
+git s
+pwd
+ll
+la
+git ba
+git s
+git ch master
+git pull
+git ch working
+git chb merg
+git ba
+git merge master
+git l
+git ch working
+git l
+q
+git ba
+git ch master
+git ba
+git bdd merg
+git bd merg
+git bdd merg
+git ba
+git bdd working
+git chb working
+ll
+cd gui
+ll
+which python
+pip
+pip install virtualenv
+which virtualenv
+virtualenv
+export PIP_REQUIRE_VIRTUALENV=false
+pip install virtualenv
+which pip
+pip list
+/usr/local/bin/pip 
+/usr/local/bin/pip install virtualenv
+export PIP_REQUIRE_VIRTUALENV=true
+ll
+pwd
+ll
+ll server/
+python server/strtest.py 
+python server/strtest.py 
+pwd
+cd ../..
+ll
+mkdir foss
+cd foss
+git clone https://github.com/simplejson/simplejson.git
+ll
+cd ..
+ll
+cd uts
+ll
+git s
+pwd
+cd ..
+ll
+cd foss
+ls
+git clone https://github.com/rlotun/txWebSocket.git
+pwd
+su overlord
+ cd 
+git s
+la
+git add .bash_*
+git s
+git cam 'updated scripts to work with MBPr'
+git r
+gir ba
+git ba
+git push
+sudo overlord
+su overlord
+su overlord
+exit
+pwd
+who
+ll
+cd 
+pwd
+virtualenv
+la
+ls osxenv/
+git s
+ls
+ls osxenv/
+la osxenv/
+la
+ls .gitignore
+ls osxenv/
+git r
+git b
+cd dev
+ll
+uname -a
+mkdir ptemp
+cd ptemp
+ls
+virtualenv testenv
+ls
+testenv/bin/activate
+ls testenv/bin/
+source testenv/bin/activate
+pip
+pip list
+ls
+mkdir m2crypto-deps
+pip install --download m2crypto-deps/ m2crypto
+ls m2crypto-deps/
+ls
+pip list
+pip install --no-index --find-links m2crypto-deps/ m2crypto
+ls
+ls m2crypto-deps/
+pip install --no-index --find-links m2crypto-deps/ m2crypto
+ls
+vi pwncrypt5.py
+ll
+python pwncrypt5.py 
+vi pwncrypt5.py
+python pwncrypt5.py 
+source testenv/bin/deactivate
+source testenv/bin/activate
+ls
+cd dev
+cd 
+ls
+cd backup/
+ls
+ll
+ll
+cd ..
+ll
+cd foss
+ll
+git clone https://github.com/alfajango/jquery-dynatable.git
+pwd
+less .bash_profile 
+less .bash_profile 
+ifconfig
+ls
+uname -a
+uname -a
+pwd
+cd dev
+ll
+cd undertowswirl/
+ls
+ll
+cd source/
+ll
+cd uts
+ll
+git r
+git l
+git pull
+git pull
+git pull
+python uts.py -f test/test1.db --gui
+ls
+cd ..
+ls
+source pvirtenv/bin/activate
+cd uts/
+ls
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
+pwd
+ll
+pwd
+cd dev
+ll
+cd ptemp
+ll
+ls m2crypto-deps/
+ls
+ssh 10.5.1.50
+cd ../undertowswirl/source/uts
+ls
+la
+git s
+git l
+git pull
+git r
+git ba
+git ch master
+git ba
+git bdd dyntest
+git ba
+git ch malloc dyntest
+git fetch
+git chb dyntext malloc/dyntest
+git ba
+git pull
+git s
+git diff gui/js/websocket.js 
+git s
+git alias
+git r
+git rr
+cat ~/.gitconfig 
+git s
+git rh
+git s
+git rehh
+git s
+git l
+rm .DS_Store 
+cd ..
+ll
+cd undertowswirl/
+ll
+ls docs
+ls libs
+cd source/
+ls
+cd uts
+git a
+la
+git s
+ls
+rm -rf test1_2014-09-14_001631
+la
+git s
+git r
+git b
+git l
+less ~/.gitconfig 
+git rehh
+git s
+git pull
+git r
+git b
+git chb dyntest
+git ba
+ls
+python uts.py -f test/test1.db --gui
+ls ..
+source ../pvirtenv/bin/activate
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
+python uts.py -f test/test1.db --gui
diff --git a/.bash_profile b/.bash_profile
index fbd9475..6576c55 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -10,6 +10,7 @@ source ~/.bash_crypto
 source ~/.bash_servers
 source ~/.bash_tools
 source ~/.bash_dev
+source ~/.bash_android
 
 # prompt
 PS1="[\u@\h:\W] "
diff --git a/androidenv.sh b/androidenv.sh
deleted file mode 100755
index 759b1ed..0000000
--- a/androidenv.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# set the path to android executables
-#
-
-# java
-export JAVA_HOME=/Applications/android-dev/jdk1.7.0_17/Contents/Home
-export JAVA_BIN=/Applications/android-dev/jdk1.7.0_17/Contents/Home/bin
-
-# ant
-export ANT_HOME=/Applications/android-dev/ant
-export ANT_BIN=/Applications/android-dev/ant/bin
-
-# set path
-export PATH=$ANT_BIN:$JAVA_BIN:$PATH
-
-###  ANDROID  ###
-
-# used by ant scripts
-export ANDROID_SDK_HOME=/Applications/android-dev/android-sdk-macosx
-
-# set path to android tools (adb, zipalign, dx, etc...)
-export PATH=/Applications/android-dev/android-sdk-macosx/build-tools/17.0.0:$PATH
-export PATH=/Applications/android-dev/android-sdk-macosx/platform-tools:$PATH
-export PATH=/Applications/android-dev/android-sdk-macosx/tools:$PATH
-
-# ndk
-export PATH=/Applications/android-dev/android-ndk-r9b:$PATH