diff --git a/.ackrc b/.ackrc
index 0a8fe58..49dba91 100644
--- a/.ackrc
+++ b/.ackrc
@@ -1,5 +1,10 @@
 #--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=eprime=.eprime,
+--type-set=essence=.essence
+--type-set=e=.eprime,.essence,.solution
+--type-set=gen-ess=.eprime,.logs,.minion,.log,.eprime.solution
 --type-set=bak=.bak
 --type-set=markdown=.md,.markdown,mdown
 --type-add=java=.pde
diff --git a/.bash_profile b/.bash_profile
index ff70512..0c2a415 100755
--- a/.bash_profile
+++ b/.bash_profile
@@ -5,6 +5,12 @@ export GIT_PS1_SHOWDIRTYSTATE=true
 export GIT_PS1_SHOWUNTRACKEDFILES=true
 export GIT_PS1_SHOWSTASHSTATE=true
 
+export LC_CTYPE=en_GB.UTF-8;
+export LANG=en_GB.UTF-8
+
+#for gnu parallel
+export PARALLEL="-j7"
+
 # bilalh@8afbf821: [develop]      full colour + commit id + branch
 #export PS1='\[$(tput setaf 3)\]\u@\h:\[$(tput sgr0)$(tput setaf 5)\]\[$(tput sgr0)$(tput setaf 2)\] $(__git_ps1 "[%s]") \[$(tput sgr0)\]$ '
 ### History Settings
@@ -17,6 +23,8 @@ declare -x HISTIGNORE='cs:jr*:gitx:hista:aes*:srm*: *'
 alias h='history | grep '
 alias hist='history | less '
 
+#allow colour in less 
+export LESS='-R'
 
 ### Bash options 
 shopt -s histappend          # all sessions are saved 
@@ -29,32 +37,43 @@ export FIGNORE=$FIGNORE:.o:.out:.pyc:.pdfsync:.log:.bbl:.aux:.blg:.out:.toc:
 
 # Colorize the prompt and commands such as ls
 export CLICOLOR=1
-export LSCOLORS=ExFxCxDxbxegedabagacad
+# light colours
+#export LSCOLORS=ExFxCxDxbxegedabagacad
+# dark colours
+export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx
 
 # Completion for git + others
-[ -d ~/.completion/ ] &&  for i in ~/.completion/*.sh; do source $i; done
-
-
+[ -d /usr/local/etc/bash_completion.d/ ] &&  for i in /usr/local/etc/bash_completion.d/*; do source $i; done
 
 # bashmarks
 [ -f  ~/.local/bin/bashmarks.sh ]  && source ~/.local/bin/bashmarks.sh 
 
 ### Path Settings 
 # Path settings(bin before current $PATH to override default version)
-PATH=$HOME/bin:/usr/local/bin:$PATH
+PATH=$HOME/bin:$HOME/bin/haskell_stuff:/usr/local/bin:$PATH
 PATH=$PATH:/usr/local/sbin:$HOME/bin/mplayer_osx
-PATH=$PATH:$HOME/Library/Haskell/bin
+PATH=$HOME/Library/Haskell/bin:$HOME/.cabal/bin:$PATH
 
-# Scripts 
-[ -d ~/.pscripts/  ] && PATH=$PATH:~/.pscripts/
+# Scripts for PATH 
+[ -d ~/.pscripts/  ] && PATH=$PATH:~/.pscripts
 [ -d ~/.Utilities/ ] && for i in ~/.Utilities/*; do PATH=$PATH:$i; done
-PATH=$PATH:/Users/bilalh/Programming/Projects/Shell-Tunes/extra
-
-PATH=$PATH:$HOME/Programming/Java/android-sdk-mac_x86/platform-tools
-PATH=$PATH:/Users/bilalh/Uni/CS/SH/ws/CS4099-SH/tools/scripts
+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
+#PATH=$PATH:/Applications/Comet
+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 ANDROID_SDK=$HOME/Programming/Java/android-sdk-mac_x86
+#Other Stuff
+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
 
@@ -63,7 +82,4 @@ export R_HOME=/Library/Frameworks/R.framework/Resources
 
 alias comp='. `brew --prefix`/etc/bash_completion'
 
-
-export PATH=/Applications/SenchaSDKTools-2.0.0-beta3:$PATH
-
-export SENCHA_SDK_TOOLS_2_0_0_BETA3="/Applications/SenchaSDKTools-2.0.0-beta3"
+export CONJURE_REPO="~/CS/conjure"
diff --git a/.bashrc b/.bashrc
index 7202c10..40fc85f 100644
--- a/.bashrc
+++ b/.bashrc
@@ -3,7 +3,4 @@
 
 [ -d ~/.pbash/ ] &&  for i in ~/.pbash/*.sh; do source $i; done
 
-
-export PATH=/Applications/SenchaSDKTools-2.0.0-beta3:$PATH
-
-export SENCHA_SDK_TOOLS_2_0_0_BETA3="/Applications/SenchaSDKTools-2.0.0-beta3"
+PATH=$HOME/.rvm/bin:$PATH # Add RVM to PATH for scripting
diff --git a/.gitconfig b/.gitconfig
index 36a2809..a567520 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,7 @@
 [user]
-  	name = Bilal Syed Hussain
+	name = Bilal Syed Hussain
 	email = bh246@st-andrews.ac.uk
-  # email = bhterra@gmail.com
+	bemail = bilalshussain@gmail.com
 [color]
 	ui = auto
 [core]
@@ -67,14 +67,17 @@
 [difftool.latex]
 	cmd = latexdiff  \"$LOCAL\" \"$REMOTE\"
 [difftool "Kaleidoscope"]
-	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [difftool]
 	prompt = false
 [diff]
 	tool = Kaleidoscope
 [difftool "sourcetree"]
-	cmd = /Applications/Kaleidoscope.app/Contents/MacOS/ksdiff -w \"$LOCAL\" \"$REMOTE\"
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
 	path = 
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
+[mergetool "Kaleidoscope"]
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustExitCode = true
diff --git a/.hgrc b/.hgrc
old mode 100644
new mode 100755
index 267fa16..1707072
--- a/.hgrc
+++ b/.hgrc
@@ -1,9 +1,9 @@
 [ui]
-username=Bilal Hussain <bh246@st-andrews.ac.uk>
+username=Bilal Syed Hussain <bh246@st-andrews.ac.uk>
 
 ignore=/Users/bilalh/.hgignore_global
 [web]
-cacerts =/Users/bilalh/Uni/CS/its.crt  
+cacerts =/Users/bilalh/CS/its.crt  
 [merge-tools]
 sourcetreemerge.gui=False
 sourcetreebulkmerge.gui=False
@@ -15,6 +15,12 @@ sourcetreemerge.premerge=True
 sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
 sourcetreebulkmerge.premerge=False
 sourcetreebulkmerge.binary=True
-[extdiff]
-cmd.sourcetreediff=/Applications/Kaleidoscope.app/Contents/MacOS/ksdiff
-opts.sourcetreediff=-w
+[alias]
+s = status
+c = commit
+
+[extensions]
+hgext.bookmarks =
+hggit =
+hgext.extdiff =
+hgext.purge=
diff --git a/.inputrc b/.inputrc
index 1d0998f..8dabd3c 100644
--- a/.inputrc
+++ b/.inputrc
@@ -1,3 +1,4 @@
+# completion that ignores the the case of the files
 set completion-ignore-case On
 
 # these allow you to use ctrl+left/right arrow keys
@@ -22,4 +23,4 @@ set input-meta on
 set output-meta on
 set convert-meta off
 
-
+set match-hidden-files off