merge conflict

Makefile

@@ -10,7 +10,7 @@ DOTPROFILE=~/.profile
 home: $(DOTGITCONFIG) $(DOTPROFILE)
 	$(DOTDEE) $(DOTPROFILE)
 
-ws: common mosh emacs git ruby haskell perl tmux vim zsh home
+ws: common mosh git ruby haskell perl tmux vim zsh home
 
 all: home
 

common/.profile.d/20-functions.sh

@@ -80,3 +80,10 @@ login_shell()
 {
   [ "$-" = "*i*" ]
 }
+
+# Yeah, sick of using the web browser for this crap
+# Use is NUM FROM TO and boom get the currency converted from goggle.
+cconv()
+{
+  curl -L --silent "https://www.google.com/finance/converter?a=$1&from=$2&to=$3" | grep converter_result | perl -pe 's|[<]\w+ \w+[=]\w+[>]||g;' -pe 's|[<][/]span[>]||'
+}

haskell/.profile.d/10-path-haskell.sh

@@ -0,0 +1,3 @@
+# haskell/.profile.d/10-path-haskell.sh
+PATH="${HOME}/.cabal/bin:${PATH}:${HOME}/.cabin/bin"
+export PATH

osx/.profile.d/01-path-osx.sh

@@ -1,3 +0,0 @@
-# osx/.profile.d/10-path-osx.sh
-PATH="/usr/local/bin:${PATH}"
-export PATH

osx/.profile.d/10-path-osx.sh

@@ -0,0 +1,5 @@
+# osx/.profile.d/10-path-osx.sh
+osx_release=$(sw_vers -productVersion | sed -e 's/\.[0-9]\{1\}//2')
+brew_home=/usr/local/brew/${osx_release}
+PATH="${brew_home}/bin:/usr/local/bin:${PATH}"
+export PATH