diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e4e5f6c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
\ No newline at end of file
diff --git a/osx/.bashrc b/osx/.bashrc
new file mode 100644
index 0000000..0305cee
--- /dev/null
+++ b/osx/.bashrc
@@ -0,0 +1,197 @@
+UNAME=uname
+
+### THIS MACHINE SPECIFIC STUFF ####
+export M2=~/.m2/repository
+export WORKON_HOME=~/Envs
+export ANDROID_HOME=~/workspace/java/android-sdk-linux
+
+# Reload this file due to frequent edits
+alias reload='source ~/.bash_profile'
+
+#### PATH ####
+#export PATH=$PATH:~/bin:$ANDROID_HOME/tools
+export PATH=/usr/local/share/python:/usr/local/bin:/usr/bin:$PATH
+export PATH=$PATH:/usr/local/share/npm/bin
+export LD_LIBRARY_PATH=`pwd`
+
+#### Defaults ####
+# Default editor
+export EDITOR="emacs -nw -q"
+
+#### Aiases ####
+#alias ll='ls -l | grep -v -E ".pyc$|~$"'
+alias lx='ls -lXB'               # sort by extension
+alias lk='ls -lSr'               # sort by size
+alias lm='ls -alh |more'         # pipe through 'more'
+alias lsd='ls -lh | grep "^d"'   # list only directories
+alias lsl='ls -lh | grep "^l"'   # list only links
+# list long, human readable, ignore implied~,
+# ignore compiled python files
+alias ll='ls -hlB --group-directories-first --hide=*.pyc'
+ # list including .dotfiles
+alias lsa='ls -lAh --group-directories-first'
+alias lz="ls -lZ"                # SELinux display
+
+## directory aliases
+alias mkdir='mkdir -p'  #Make intermediaries
+# Disk usage
+alias du="du -h"
+# Grepping
+alias h="history | grep"
+#enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    eval "`dircolors -b`"
+    alias ls='ls --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# emacs modes
+alias gemacs="emacs-snapshot-gtk"
+alias nemacs="emacs -nw"
+
+# maven stuff
+alias mvnc="mvn clean && mvn -Dmaven.test.skip=true install"
+
+# moving aliases
+alias ..='cd ..'
+alias ...='cd ../..'
+alias downloads='cd ~/downloads'
+
+# apt aliases
+alias ainstall='sudo apt-get install'
+
+# Misc
+alias rtfm='man'
+
+# local aliases
+if [ -f ~/.bash_aliases ]; then
+   . ~/.bash_aliases
+fi
+
+#### Bash Functions ####
+function ginit {
+    mkdir $1
+    cd $1
+    git init
+}
+
+# Killlist
+function killps {
+    ps aux | grep $1 | grep -v grep | awk {'print $2'} | xargs kill -9 2> /dev/null
+}
+
+# Makes directory then moves into it
+function mkcdr {
+    mkdir -p -v $1
+    cd $1
+}
+
+# Easy extract
+extract () {
+  if [ -f $1 ] ; then
+      case $1 in
+          *.tar.bz2)   tar xvjf $1    ;;
+          *.tar.gz)    tar xvzf $1    ;;
+          *.bz2)       bunzip2 $1     ;;
+          *.rar)       rar x $1       ;;
+          *.gz)        gunzip $1      ;;
+          *.tar)       tar xvf $1     ;;
+          *.tbz2)      tar xvjf $1    ;;
+          *.tgz)       tar xvzf $1    ;;
+          *.zip)       unzip $1       ;;
+          *.Z)         uncompress $1  ;;
+          *.7z)        7z x $1        ;;
+          *)           echo "don't know how to extract '$1'..." ;;
+      esac
+  else
+      echo "'$1' is not a valid file!"
+  fi
+}
+
+# A frequent source of complaint from cat
+# is that I've just asked it to cat a directory.
+# If I have, just DWIM and do it happily.
+function catorls () {
+    if [ -d $1 ];
+    then
+        ls -l $1
+    else
+        cat $1
+    fi
+}
+alias cat="catorls"
+
+# don't put duplicate lines in the history. See bash(1) for more options
+# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
+export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
+# ... or force ignoredups and ignorespace
+export HISTCONTROL=ignoreboth
+
+function parse_git_dirty {
+  [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"
+}
+
+function parse_git_branch {
+  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/[git-\1$(parse_git_dirty)]/"
+}
+
+function hg_dirty() {
+    hg status --no-color 2> /dev/null \
+    | awk '$1 == "?" { unknown = 1 } 
+           $1 != "?" { changed = 1 }
+           END {
+             if (changed) printf "!"
+             else if (unknown) printf "?" 
+           }'
+}
+
+function hg_branch() {
+    hg branch 2> /dev/null | sed -e '/^[.*]/d' -e "s/\(^.*\)/[hg-\1$(hg_dirty)]/"
+}
+
+#### Colours ^ Prompt ####
+DEFAULT="[37;40m"
+PINK="[35;40m"
+GREEN="[32;40m"
+ORANGE="[33;40m"
+PS1='\n\e${PINK}\u \
+\e${DEFAULT}at \e${ORANGE}\h \
+\e${DEFAULT}in \e${GREEN}\w\
+\e${ORANGE}$(parse_git_branch) \
+\e${ORANGE}$(hg_branch) \
+\n$ '
+
+### Completion ###
+if [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+fi
+
+# Support for multiple interpreters.
+
+# Goodbye Grep
+which ack > /dev/null
+if [ $? -ne 0 ] ; then
+    which ack-grep > /dev/null
+    if [ $? -ne 0 ] ; then
+        echo "Where the ack has ack gone?"
+    else
+        alias ack="ack-grep"
+    fi
+fi
+
+# keybindings
+bind '"\C-f\C-g": "find . | grep "';
+bind '"\C-f\C-x": "find . | xargs grep "'
+bind '"\C-p\C-a": "ps aux | grep "'
+
+# Hookup Python VirtualEnvironments
+source /usr/local/bin/virtualenvwrapper.sh
+
+# Display to the terminal
+function osd {
+    osd_cat --align=center --pos=middle --outline=1 \
+	--outlinecolour=#000000 --delay=3 --font="$font" \
+	"$@"
+}