Merge branch 'master' of github.com:aquatix/dotfiles

.bash_aliases

@@ -6,8 +6,6 @@ alias ll='ls -la'
 # append history instead of overwriting:
 shopt -s histappend
 
-#alias findphp='find . -name "*php" | xargs grep'
-#alias findphp='find . -name "*.php" | xargs grep -i'
 alias findphp='find . -name "*.php" | xargs grep'
 alias findjs='find . -name "*.js" | xargs grep'
 alias findcss='find . -name "*.css" | xargs grep'
@@ -41,6 +39,10 @@ alias so=git
 # 20140521 force 256 colours in tmux
 alias tmux='tmux -2'
 
+# 20140715 you can connect to your session normally, and if you are bothered by
+# another session that forced down your tmux window size you can simply call
+alias takeover="tmux detach -a"
+
 function fuck() {
   if killall -9 "$2"; then
     echo ; echo " (╯°□°）╯︵$(echo "$2"|toilet -f term -F rotate)"; echo