merge the two, so I don't have conflicting branches

.bash_aliases

@@ -10,30 +10,30 @@
     #alias dir='ls --color=auto --format=vertical'
     #alias vdir='ls --color=auto --format=long'
 
-case `uname` in
-Linux)
-	if [ "$TERM" != "dumb" ]; then
-		eval "`dircolors -b`"
-	fi
-	alias ls='ls -F --color=auto'
-        alias open='xdg-open'
-	;;
-Darwin)
-	alias ls='ls -FG'
-	;;
-FreeBSD)
-	alias ls='ls -FG'
-	;;
-SunOS)
-	alias ls='ls -F'
-	;;
-*)
-	if [ "$TERM" != "dumb" ]; then
-		eval "`dircolors -b`"
-	fi
-	alias ls='ls --color=auto'
-	;;
-esac
+#case `uname` in
+#Linux)
+	#if [ "$TERM" != "dumb" ]; then
+		#eval "`dircolors -b`"
+	#fi
+	#alias ls='ls -F --color=auto'
+        #alias open='xdg-open'
+	#;;
+#Darwin)
+	#alias ls='ls -FG'
+	#;;
+#FreeBSD)
+	#alias ls='ls -FG'
+	#;;
+#SunOS)
+	#alias ls='ls -F'
+	#;;
+#*)
+	#if [ "$TERM" != "dumb" ]; then
+		#eval "`dircolors -b`"
+	#fi
+	#alias ls='ls --color=auto'
+	#;;
+#esac
 
 	
 
@@ -52,7 +52,7 @@ alias grep="grep --color=auto"
 alias dvtm="dvtm -m \"^w\""
 alias tm="tmux -2 attach"
 alias ppjson="python -mjson.tool"
-alias tmux-pwn='tmux list-clients | sed "s|^\(/dev/ttys[0-9]\+\).*\[\([0-9]\+x[0-9]\+\).*$|\2 \1|" | sort -r -n | tail -n +2 | cut -d " " -f 2 | xargs -n 1 tmux detach-client -t'
+#alias tmux-pwn='tmux list-clients | sed "s|^\(/dev/ttys[0-9]\+\).*\[\([0-9]\+x[0-9]\+\).*$|\2 \1|" | sort -r -n | tail -n +2 | cut -d " " -f 2 | xargs -n 1 tmux detach-client -t'
 
 #Cosmetic/useful
 #alias naim="naim --noscreen"

.config/awesome/rc.lua

@@ -156,7 +156,6 @@ function (widget, args)
         return args[2]
 end , 120, "BAT0")
 
-
 -- Register CPU widget
 vicious.register(cpuwidget, vicious.widgets.cpu, 
                     function (widget, args)

.config/fish/config.fish

@@ -1,4 +1,5 @@
 set PATH ~/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin $PATH
 
 set fish_greeting ""
+
 . ~/.bash_aliases

.gitmodules

@@ -61,6 +61,9 @@
 [submodule ".vim/bundle/vim-angry"]
 	path = .vim/bundle/vim-angry
 	url = https://github.com/b4winckler/vim-angry.git
+[submodule ".vim/bundle/YouCompleteMe"]
+	path = .vim/bundle/YouCompleteMe
+	url = https://github.com/Valloric/YouCompleteMe.git
 [submodule ".vim/bundle/vim-sparkup"]
 	path = .vim/bundle/vim-sparkup
 	url = git://github.com/tristen/vim-sparkup.git

.vim/bundle/YouCompleteMe

@@ -0,0 +1 @@
+Subproject commit a7203d97c8aacf5e9da8872ff2b269e8af75bb41

.vimrc

@@ -162,7 +162,12 @@ let g:ConqueTerm_CWInsert = 1
 let g:ConqueTerm_InsertOnEnter = 0
 let g:ConqueTerm_SendVisKey = '<Leader>ss'
 
-" * MiniBufExplorer
+" * YouCompleteMe
+let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+let g:ycm_confirm_extra_conf = 0
+"let g:ycm_add_preview_to_completeopt = 1
+
+" * MinBufExplorer
 "let g:miniBufExplMapWindowNavVim = 1
 "let g:miniBufExplMapWindowNavArrows = 1
 "let g:miniBufExplMapCTabSwitchBufs = 1
@@ -180,7 +185,8 @@ let g:CommandTMaxDepth = 7
 " let g:org_todo_setup='TODO | DONE'
 " while g:org_tag_setup is itself a string
 "let g:org_tag_setup='{@home(h) @work(w) @tennisclub(t)} \n {easy(e) hard(d)} \n {computer(c) phone(p)}'
-
+au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+au BufEnter *.org            call org#SetOrgFileType()
 
 
 " ** STATUSLINE **

.ycm_extra_conf.py

@@ -0,0 +1,120 @@
+import os
+import ycm_core
+from clang_helpers import PrepareClangFlags
+
+# These are the compilation flags that will be used in case there's no
+# compilation database set (by default, one is not set).
+# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR.
+flags = [
+'-Wall',
+'-Wextra',
+'-Werror',
+'-Wc++98-compat',
+'-Wno-long-long',
+'-Wno-variadic-macros',
+'-fexceptions',
+'-DNDEBUG',
+'-DUSE_CLANG_COMPLETER',
+# THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
+# language to use when compiling headers. So it will guess. Badly. So C++
+# headers will be compiled as C headers. You don't want that so ALWAYS specify
+# a "-std=<something>".
+# For a C project, you would set this to something like 'c99' instead of
+# 'c++11'.
+'-std=c++11',
+# ...and the same thing goes for the magic -x option which specifies the
+# language that the files to be compiled are written in. This is mostly
+# relevant for c++ headers.
+# For a C project, you would set this to 'c' instead of 'c++'.
+'-x',
+'c++',
+'-isystem',
+'../BoostParts',
+'-isystem',
+# This path will only work on OS X, but extra paths that don't exist are not
+# harmful
+'/System/Library/Frameworks/Python.framework/Headers',
+'-isystem',
+'../llvm/include',
+'-isystem',
+'../llvm/tools/clang/include',
+'-I',
+'.',
+'-I',
+'./ClangCompleter',
+'-isystem',
+'./tests/gmock/gtest',
+'-isystem',
+'./tests/gmock/gtest/include',
+'-isystem',
+'./tests/gmock',
+'-isystem',
+'./tests/gmock/include'
+]
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = ''
+
+if compilation_database_folder:
+  database = ycm_core.CompilationDatabase( compilation_database_folder )
+else:
+  database = None
+
+
+def DirectoryOfThisScript():
+  return os.path.dirname( os.path.abspath( __file__ ) )
+
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+  if not working_directory:
+    return flags
+  new_flags = []
+  make_next_absolute = False
+  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+  for flag in flags:
+    new_flag = flag
+
+    if make_next_absolute:
+      make_next_absolute = False
+      if not flag.startswith( '/' ):
+        new_flag = os.path.join( working_directory, flag )
+
+    for path_flag in path_flags:
+      if flag == path_flag:
+        make_next_absolute = True
+        break
+
+      if flag.startswith( path_flag ):
+        path = flag[ len( path_flag ): ]
+        new_flag = path_flag + os.path.join( working_directory, path )
+        break
+
+    if new_flag:
+      new_flags.append( new_flag )
+  return new_flags
+
+
+def FlagsForFile( filename ):
+  if database:
+    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+    # python list, but a "list-like" StringVec object
+    compilation_info = database.GetCompilationInfoForFile( filename )
+    final_flags = PrepareClangFlags(
+        MakeRelativePathsInFlagsAbsolute(
+            compilation_info.compiler_flags_,
+            compilation_info.compiler_working_dir_ ),
+        filename )
+
+  else:
+    relative_to = DirectoryOfThisScript()
+    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+  return {
+    'flags': final_flags,
+    'do_cache': True
+  }

bin/tmux-pwn

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+
+tmux list-clients | sed "s|^\(/dev/ttys[0-9]\+\).*\[\([0-9]\+x[0-9]\+\).*$|\2 \1|" | sort -r -n | tail -n +2 | cut -d " " -f 2 | xargs -n 1 tmux detach-client -t