diff --git a/.ackrc b/.ackrc
index 49dba91..10610ce 100644
--- a/.ackrc
+++ b/.ackrc
@@ -1,6 +1,7 @@
 #--type-set=music=.mp3,.m4a,.flac,.ac3,.ogg,.aiff,.m4b,.aac,.wav,.wmv,.ape,.mka
 #--type-set=manga=.cbz,.cbr,.cba,cb7
 --type-set=juck=.xcodeproj
+--type-set=txt=.txt
 --type-set=eprime=.eprime,
 --type-set=essence=.essence
 --type-set=e=.eprime,.essence,.solution
diff --git a/.bash_profile b/.bash_profile
old mode 100755
new mode 100644
diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/.hgignore_conjure b/.hgignore_conjure
new file mode 100644
index 0000000..1393bc2
--- /dev/null
+++ b/.hgignore_conjure
@@ -0,0 +1,24 @@
+dist
+UpTests$
+debugging
+.tmtags
+tags
+.swp
+.hi
+.essence.binary
+savilerow/
+.essence-repr/
+syntax: regexp
+^rules
+EssenceCatalog/.*/
+EssenceCatalog/.*rts
+specs/.*/
+specs/.*rts
+
+syntax: glob
+*~
+.DS_Store
+*orig
+*.o
+*.o-boot
+.shelly/
diff --git a/.hgignore_global b/.hgignore_global
index 187b396..fcfd9c3 100644
--- a/.hgignore_global
+++ b/.hgignore_global
@@ -2,3 +2,12 @@ syntax: glob
 
 *~
 .DS_Store
+ConjureGetSolution
+.shelly
+GenerateRandomParam2
+Debuging
+UpTests
+out
+.MINIONSTATS*
+.MINIONSOLS*
+intermediate
\ No newline at end of file
diff --git a/.hgrc b/.hgrc
old mode 100755
new mode 100644
index 1707072..dcacb2a
--- a/.hgrc
+++ b/.hgrc
@@ -24,3 +24,4 @@ hgext.bookmarks =
 hggit =
 hgext.extdiff =
 hgext.purge=
+prompt = /Users/bilalh/Programming/prog/hg-prompt/prompt.py 
diff --git a/.screenrc b/.screenrc
old mode 100755
new mode 100644
diff --git a/.slate b/.slate
new file mode 100644
index 0000000..f97791b
--- /dev/null
+++ b/.slate
@@ -0,0 +1,29 @@
+config defaultToCurrentScreen true
+config windowHintsShowIcons true
+config windowHintsIgnoreHiddenWindows false
+config windowHintsSpread true
+config windowHintsShowIcons true
+ 
+ 
+# Cmd+G brings up grid like Divvy (for each monitor)
+bind g:cmd grid padding:5 0:8,8 1:8,5
+ 
+# Abstract positions
+alias full        move   screenOriginX;screenOriginY screenSizeX;screenSizeY
+alias lefthalf    move   screenOriginX;screenOriginY screenSizeX/2;screenSizeY
+alias righthalf   move   screenOriginX+screenSizeX/2;screenOriginY screenSizeX/2;screenSizeY
+alias topleft     corner top-left     resize:screenSizeX/2;screenSizeY/2
+alias topright    corner top-right    resize:screenSizeX/2;screenSizeY/2
+alias bottomleft  corner bottom-left  resize:screenSizeX/2;screenSizeY/2
+alias bottomright corner bottom-right resize:screenSizeX/2;screenSizeY/2
+ 
+# Numpad location Bindings
+
+bind 1:ctrl;alt;cmd ${lefthalf}
+bind 2:ctrl;alt;cmd ${righthalf}
+
+bind 3:ctrl;alt;cmd ${topleft}
+bind 4:ctrl;alt;cmd ${topright}
+
+bind 5:ctrl;alt;cmd ${bottomleft}
+bind 6:ctrl;alt;cmd ${bottomright}
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..692b87b
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,127 @@
+export ZSH=$HOME/.oh-my-zsh
+export PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+#export ZSH_THEME=avery
+
+
+export ZSH_THEME="powerline"
+export POWERLINE_RIGHT_A="exit-code"
+export POWERLINE_HIDE_USER_NAME="true"
+export POWERLINE_HIDE_HOST_NAME="true"
+export POWERLINE_DISABLE_RPROMPT="true"
+export POWERLINE_RIGHT_B=""
+export POWERLINE_RIGHT_A=""
+
+
+export DEFAULT_USER=Bilalh
+
+plugins=(funcs todo)
+plugins+=(osx ruby autojump encode64 gem git-extras pip battery brew pygmentize python       zsh-syntax-highlighting history-substring-search )
+
+DISABLE_CORRECTION=true
+source $ZSH/oh-my-zsh.sh
+
+# History
+HISTFILE=$HOME/.zsh_history
+HISTSIZE=40000
+setopt APPEND_HISTORY           # append rather than overwrite history file.
+setopt EXTENDED_HISTORY         # save timestamp and runtime information
+setopt HIST_EXPIRE_DUPS_FIRST   # allow dups, but expire old ones when I hit HISTSIZE
+setopt HIST_FIND_NO_DUPS        # don't find duplicates in history
+setopt HIST_IGNORE_ALL_DUPS     # ignore duplicate commands regardless of commands in between
+setopt HIST_IGNORE_DUPS         # ignore duplicate commands
+setopt HIST_REDUCE_BLANKS       # leave blanks out
+setopt HIST_SAVE_NO_DUPS        # don't save duplicates
+setopt INC_APPEND_HISTORY       # write after each command
+setopt SHARE_HISTORY            # share history between sessions
+setopt HIST_IGNORE_SPACE        # Don't save command starting with a space
+unsetopt cdablevars
+
+export EDITOR='vim'          # default editor 
+export LESS='-R'
+export FIGNORE=$FIGNORE:.o:.out:.pyc:.pdfsync:.log:.bbl:.aux:.blg:.out:.toc:
+export CLICOLOR=1
+
+#
+# light colours
+#export LSCOLORS=ExFxCxDxbxegedabagacad
+# dark colours
+export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx
+
+# Path settings(bin before current $PATH to override default version)
+PATH=$HOME/bin:$HOME/bin/haskell_stuff:/usr/local/bin:$PATH
+PATH=$PATH:/usr/local/sbin:$HOME/bin/mplayer_osx
+PATH=$HOME/Library/Haskell/bin:$HOME/.cabal/bin:$PATH
+
+
+PATH=$PATH:/Users/bilalh/Projects/Shell-Tunes/extra
+PATH=$PATH:~/.rvm/gems/ruby-1.9.3-p286/bin
+PATH=$PATH:/Library/Frameworks/Python.framework/Versions/3.3/bin
+#PATH=$PATH:$HOME/Programming/Java/android-sdk-mac_x86/platform-tools
+
+
+#cs PATH
+#PATH=$PATH:/Users/bilalh/CS/conjure/scripts/other
+[ -d ~/.pscripts/  ] && PATH=$PATH:~/.pscripts
+[ -d ~/.Utilities/ ] && for i in ~/.Utilities/*; do PATH=$PATH:$i; done
+PATH=$PATH:/Users/bilalh/CS/minion-build
+PATH=$PATH:/Users/bilalh/CS/savilerow
+PATH=$PATH:/Users/bilalh/CS/conjure/test/solving
+PATH=$PATH:/Users/bilalh/CS/conjure/scripts/other
+export PATH
+
+export PYTHONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH
+#export ANDROID_SDK=$HOME/Programming/Java/android-sdk-mac_x86
+export RUBY_PLATFORM="darwin"
+export R_HOME=/Library/Frameworks/R.framework/Resources
+
+export CONJURE_REPO="~/CS/conjure"
+
+
+#Adds all files in .bash at lanuch
+[ -d ~/.bash/ ] &&  for i in ~/.bash/*.sh; do source $i; done
+
+[ -d ~/.pbash/ ] &&  for i in ~/.pbash/*.sh; do source $i; done
+
+PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting
+
+#Alias and functions
+alias tl='todo list'
+
+function t(){
+    todo ${@:-list}
+}
+
+alias f='dirs -v'
+#Autoload
+autoload -U zcalc
+[ -f  ~/.local/bin/bashmarks.sh ]  && source ~/.local/bin/bashmarks.sh 
+
+#Bindings
+insert_sudo () { zle beginning-of-line; zle -U "sudo " }
+zle -N insert-sudo insert_sudo
+bindkey '^[s' insert-sudo
+
+# Skip forward/back a word with opt-arrow
+bindkey 'D' backward-word
+bindkey 'C' forward-word
+
+bindkey 'OD' beginning-of-line
+bindkey 'OC' end-of-line
+
+# for trying # 
+bindkey -s '^[3' \#
+bindkey -s '£' \#
+
+
+# man pages  IN COLOUR!
+export LESS_TERMCAP_mb=$'\E[01;31m'       # begin blinking
+export LESS_TERMCAP_md=$'\E[01;38;5;74m'  # begin bold
+export LESS_TERMCAP_me=$'\E[0m'           # end mode
+export LESS_TERMCAP_se=$'\E[0m'           # end standout-mode
+export LESS_TERMCAP_so=$'\E[38;33;246m'   # begin standout-mode - info box
+export LESS_TERMCAP_ue=$'\E[0m'           # end underline
+export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline]
+
+
+ZSH_HIGHLIGHT_STYLES[path]='none'