# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1306949615 14400
# Node ID 90ce20bf3d8b802cc34a62f3e237523b00ea09e8
# Parent  f1df95325bce02fa27bc85a8d194d6b03912293f
Moar.

diff -r f1df95325bce -r 90ce20bf3d8b vim/.vimrc
--- a/vim/.vimrc	Tue May 31 18:37:57 2011 -0400
+++ b/vim/.vimrc	Wed Jun 01 13:33:35 2011 -0400
@@ -391,6 +391,8 @@
 au BufNewFile,BufRead settings.py  setlocal filetype=python.django
 au BufNewFile,BufRead settings.py  setlocal foldmethod=marker
 au BufNewFile,BufRead forms.py     setlocal filetype=python.django
+au BufNewFile,BufRead common_settings.py  setlocal filetype=python.django
+au BufNewFile,BufRead common_settings.py  setlocal foldmethod=marker
 
 " }}}
 " Nginx {{{
diff -r f1df95325bce -r 90ce20bf3d8b zsh/misc.zsh
--- a/zsh/misc.zsh	Tue May 31 18:37:57 2011 -0400
+++ b/zsh/misc.zsh	Wed Jun 01 13:33:35 2011 -0400
@@ -3,7 +3,6 @@
 
 alias m='mvim .'
 
-alias v='vagrant'
 alias f='fab'
 alias fd='fab dev'
 
diff -r f1df95325bce -r 90ce20bf3d8b zsh/vagrant.zsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zsh/vagrant.zsh	Wed Jun 01 13:33:35 2011 -0400
@@ -0,0 +1,5 @@
+alias v='vagrant'
+alias vs='vagrant suspend'
+alias vu='vagrant up'
+alias vh='vagrant halt'
+alias vss='vagrant ssh'