Merge branch 'local'

Conflicts:
	vim/vimrc

vim/vim/compiler/perlcritic.vim

@@ -0,0 +1,22 @@
+" Vim Compiler File
+" Compiler: perlcritic
+" Maintainer: Scott Peshak <speshak@gmail.com>
+" Last Change: 2006 Dec 19
+
+if exists("current_compiler")
+	finish
+endif
+let current_compiler = "perlcritic"
+
+if exists(":CompilerSet") != 2 
+	command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=perlcritic\ -verbose\ 1\ -2\ %
+CompilerSet errorformat=%f:%l:%c:%m
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

vim/vimrc

@@ -24,7 +24,7 @@ set wildignore=*.swp,*.bal,*.pyc,*.class
 set title
 set visualbell
 set noerrorbells
-"set nowritebackup
+set nowritebackup
 set nobackup
 set noswapfile
 filetype plugin indent on
@@ -62,8 +62,7 @@ if has("gui_running")
     set stal=2
     set toolbar=
     set guioptions-=T
-    set columns=84
+"    set columns=84
-    colorscheme solarized
 endif
 
 colorscheme default

zsh/zshrc

@@ -54,3 +54,5 @@ alias gitpretty="git log --pretty=format:'%h : %Cblue%aN%Creset : %Cred%d%Creset
 alias vi='mvim -v'
 alias vim='mvim -v'
 alias aws_bmsilva='envdir ~/Lab/AWS/bmsilva/botoenv ~/.virtualenvs/sys/bin/python ~/Lab/AWS/bmsilva/aws.py'
+
+source ~/perl5/perlbrew/etc/bashrc