diff --git a/.gitmodules b/.gitmodules
index 354f49c..62bb5c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -109,3 +109,6 @@
 [submodule "vim/bundle/mikefarmer-snipmate"]
 	path = vim/bundle/mikefarmer-snipmate
 	url = https://github.com/mikefarmer/snipmate.vim.git
+[submodule "vim/snippets"]
+	path = vim/snippets
+	url = https://github.com/scrooloose/snipmate-snippets.git
diff --git a/vim/snippets b/vim/snippets
new file mode 160000
index 0000000..15cb6bf
--- /dev/null
+++ b/vim/snippets
@@ -0,0 +1 @@
+Subproject commit 15cb6bf4fad5b11f83d2ddb7186aadc0604329c1
diff --git a/vim/snippets/.gitignore b/vim/snippets/.gitignore
deleted file mode 100644
index da39d98..0000000
--- a/vim/snippets/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-*~
-.DS_Store
-
-*.log
-*.tmp
-*.swp
-*.old
-*.bkp
-*.zip
-*.rar
-*.arj
-*.[t]gz
-*.[t]bz2
-
-tmp/
-log/
diff --git a/vim/snippets/Rakefile b/vim/snippets/Rakefile
deleted file mode 100755
index 4408445..0000000
--- a/vim/snippets/Rakefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#require 'fileutils'
-#include FileUtils
-require 'rake'
- 
-# The install task was stolen from RyanB
-# http://github.com/ryanb/dotfiles
-
-desc "install the snippets into user's vim directory @home"
-task :install => ["snippets_dir:find"] do
-  replace_all = false
-  Dir['*'].each do |file|
-    next if %w[Rakefile].include? file
-    
-    if File.exist?(File.join(@snippets_dir, "#{file}"))
-      if replace_all
-        replace_file(file)
-      else
-        print "overwrite #{File.join(@snippets_dir, file)}? [ynaq] "
-        case $stdin.gets.chomp
-        when 'a'
-          replace_all = true
-          replace_file(file)
-        when 'y'
-          replace_file(file)
-        when 'q'
-          exit
-        else
-          puts	File.join(@snippets_dir, "#{file}") 
-        end
-      end
-    else
-      link_file(file)
-    end
-  end
-end
- 
-def replace_file(file)
-  link_file(file)
-end
- 
-def link_file(file)
-  puts "linking #{path_to(file)}"
-  ln_s File.join(FileUtils.pwd,file), path_to(file), :force => true
-end
-
-def path_to(file)
-	File.join(@snippets_dir, "#{file}")
-end
-
-
-namespace :snippets_dir do
-	desc "Sets @snippets_dir dependent on which OS You run" 
-  task :find do
-    @snippets_dir = File.join(ENV['VIMFILES'] || ENV['HOME'] || ENV['USERPROFILE'], RUBY_PLATFORM =~ /mswin32/ ? "vimfiles" : ".vim", "snippets")
-  end
-
-  desc "Purge the contents of the vim snippets directory"
-  task :purge => ["snippets_dir:find"] do
-    rm_rf @snippets_dir, :verbose => true if File.directory? @snippets_dir
-    mkdir @snippets_dir, :verbose => true
-  end
-end
-
-desc "Copy the snippets directories into ~/.vim/snippets"
-task :deploy_local => ["snippets_dir:purge"] do
-  Dir.foreach(".") do |f|
-    cp_r f, @snippets_dir, :verbose => true if File.directory?(f) && f =~ /^[^\.]/
-  end
-  cp "support_functions.vim", @snippets_dir, :verbose => true
-end
-
-desc "Alias for purge"
-task :purge => ["snippets_dir:purge"]
-
-desc "Alias for default task run easy 'rake'"
-task :default => :install
diff --git a/vim/snippets/_/apache.snippet b/vim/snippets/_/apache.snippet
deleted file mode 100755
index b11ea60..0000000
--- a/vim/snippets/_/apache.snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright (c) `strftime("%Y")` ${1:`g:snips_author`} <${2:email}>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
diff --git a/vim/snippets/_/bsd.snippet b/vim/snippets/_/bsd.snippet
deleted file mode 100755
index e38aa79..0000000
--- a/vim/snippets/_/bsd.snippet
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright (c) `strftime("%Y")` ${1:`g:snips_author`} <${2:email}>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/vim/snippets/_/date/date + time.snippet b/vim/snippets/_/date/date + time.snippet
deleted file mode 100755
index c6a0e43..0000000
--- a/vim/snippets/_/date/date + time.snippet	
+++ /dev/null
@@ -1 +0,0 @@
-`strftime("%Y-%m-%d %H:%M:%S")`
diff --git a/vim/snippets/_/date/date.snippet b/vim/snippets/_/date/date.snippet
deleted file mode 100755
index 5d89951..0000000
--- a/vim/snippets/_/date/date.snippet
+++ /dev/null
@@ -1 +0,0 @@
-`strftime("%Y-%m-%d")`
diff --git a/vim/snippets/_/dox.snippet b/vim/snippets/_/dox.snippet
deleted file mode 100755
index fcdcab8..0000000
--- a/vim/snippets/_/dox.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * ${1}
- */
-
-${2}
diff --git a/vim/snippets/_/fold.snippet b/vim/snippets/_/fold.snippet
deleted file mode 100755
index faf70f8..0000000
--- a/vim/snippets/_/fold.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-# {{{ ${1:description}
-${2}
-# }}}
diff --git a/vim/snippets/_/gpl.snippet b/vim/snippets/_/gpl.snippet
deleted file mode 100755
index e8c59cd..0000000
--- a/vim/snippets/_/gpl.snippet
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright (c) `strftime("%Y")` ${1:`g:snips_author`} <${2:email}>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version ${3:version} of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
diff --git a/vim/snippets/_/lorem.snippet b/vim/snippets/_/lorem.snippet
deleted file mode 100755
index 85303ce..0000000
--- a/vim/snippets/_/lorem.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
-ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
-velit esse cillum dolore eu fugiat nulla pariatur.  Excepteur sint occaecat cupidatat non proident, sunt in
-culpa qui officia deserunt mollit anim id est laborum${1}
diff --git a/vim/snippets/_/modeline.snippet b/vim/snippets/_/modeline.snippet
deleted file mode 100755
index bf0dfa3..0000000
--- a/vim/snippets/_/modeline.snippet
+++ /dev/null
@@ -1 +0,0 @@
-`Snippet_Modeline()`
diff --git a/vim/snippets/ant/skel/basic.snippet b/vim/snippets/ant/skel/basic.snippet
deleted file mode 100644
index 276cf7d..0000000
--- a/vim/snippets/ant/skel/basic.snippet
+++ /dev/null
@@ -1,29 +0,0 @@
-<project name="PROJECT NAME" default="dist" basedir=".">
-    <description>
-    </description>
-
-    <!-- set global properties for this build -->
-    <property name="src" location="src"/>
-    <property name="build" location="build"/>
-    <property name="dist"  location="dist"/>
-
-    <target name="init">
-        <tstamp/>
-        <mkdir dir="${build}"/>
-    </target>
-
-    <target name="compile" depends="init" description="compile the source " >
-        <javac srcdir="${src}" destdir="${build}"/>
-    </target>
-
-    <target name="dist" depends="compile" description="generate the distribution" >
-        <mkdir dir="${dist}/lib"/>
-        <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/>
-    </target>
-
-    <target name="clean"
-        description="clean up" >
-        <delete dir="${build}"/>
-        <delete dir="${dist}"/>
-    </target>
-</project>
diff --git a/vim/snippets/archive/_.snippets b/vim/snippets/archive/_.snippets
deleted file mode 100755
index c3925a5..0000000
--- a/vim/snippets/archive/_.snippets
+++ /dev/null
@@ -1,7 +0,0 @@
-# Global snippets
-
-# (c) holds no legal value ;)
-snippet c)
-	`&enc[:2] == "utf" ? "©" : "(c)"` Copyright `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.${2}
-snippet date
-	`strftime("%Y-%m-%d")`
diff --git a/vim/snippets/archive/c.snippets b/vim/snippets/archive/c.snippets
deleted file mode 100755
index 500e8ed..0000000
--- a/vim/snippets/archive/c.snippets
+++ /dev/null
@@ -1,90 +0,0 @@
-# main()
-snippet main
-	int main(int argc, char const* argv[])
-	{
-		${1}
-		return 0;
-	}
-# #include <...>
-snippet inc
-	#include <${1:stdio}.h>${2}
-# #include "..."
-snippet Inc
-	#include "${1:`Filename("$1.h")`}"${2}
-# #ifndef ... #define ... #endif
-snippet Def
-	#ifndef $1
-	#define ${1:SYMBOL} ${2:value}
-	#endif${3}
-snippet def
-	#define 
-# Header Include-Guard
-# (the randomizer code is taken directly from TextMate; it could probably be
-# cleaner, I don't know how to do it in vim script)
-snippet once
-	#ifndef ${1:`toupper(Filename('', 'UNTITLED').'_'.system("/usr/bin/ruby -e 'print (rand * 2821109907455).round.to_s(36)'"))`}
-	
-	#define $1
-	
-	${2}
-	
-	#endif /* end of include guard: $1 */
-# If Condition
-snippet if
-	if (${1:/* condition */}) {
-		${2:/* code */}
-	}
-snippet el
-	else {
-		${1}
-	}
-# Tertiary conditional
-snippet t
-	${1:/* condition */} ? ${2:a} : ${3:b}
-# Do While Loop
-snippet do
-	do {
-		${2:/* code */}
-	} while (${1:/* condition */});
-# While Loop
-snippet wh
-	while (${1:/* condition */}) {
-		${2:/* code */}
-	}
-# For Loop
-snippet for
-	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-		${4:/* code */}
-	}
-# Custom For Loop
-snippet forr
-	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
-		${5:/* code */}
-	}
-# Function
-snippet fun
-	${1:void} ${2:function_name}(${3})
-	{
-		${4:/* code */}
-	}
-# Typedef
-snippet td
-	typedef ${1:int} ${2:MyCustomType};
-# Struct
-snippet st
-	struct ${1:`Filename('$1_t', 'name')`} {
-		${2:/* data */}
-	}${3: /* optional variable list */};${4}
-# Typedef struct
-snippet tds
-	typedef struct ${2:$1 }{
-		${3:/* data */}
-	} ${1:`Filename('$1_t', 'name')`};
-# printf
-# unfortunately version this isn't as nice as TextMates's, given the lack of a
-# dynamic `...`
-snippet pr
-	printf("${1:%s}\n"${2});${3}
-# fprintf (again, this isn't as nice as TextMate's version, but it works)
-snippet fpr
-	fprintf(${1:stderr}, "${2:%s}\n"${3});${4}
diff --git a/vim/snippets/archive/cpp.snippets b/vim/snippets/archive/cpp.snippets
deleted file mode 100755
index e4850cd..0000000
--- a/vim/snippets/archive/cpp.snippets
+++ /dev/null
@@ -1,30 +0,0 @@
-# Read File Into Vector
-snippet readfile
-	std::vector<char> v;
-	if (FILE *${2:fp} = fopen(${1:"filename"}, "r")) {
-		char buf[1024];
-		while (size_t len = fread(buf, 1, sizeof(buf), $2))
-			v.insert(v.end(), buf, buf + len);
-		fclose($2);
-	}${3}
-# std::map
-snippet map
-	std::map<${1:key}, ${2:value}> map${3};
-# std::vector
-snippet vector
-	std::vector<${1:char}> v${2};
-# Namespace
-snippet ns
-	namespace ${1:`Filename('', 'my')`} {
-		${2}
-	} /* $1 */
-# Class
-snippet cl
-	class ${1:`Filename('$1_t', 'name')`} {
-	public:
-		$1 (${2:arguments});
-		virtual ~$1 ();
-	
-	private:
-		${3:/* data */}
-	};
diff --git a/vim/snippets/archive/html.snippets b/vim/snippets/archive/html.snippets
deleted file mode 100755
index 3c3411b..0000000
--- a/vim/snippets/archive/html.snippets
+++ /dev/null
@@ -1,192 +0,0 @@
-# Some useful Unicode entities
-# Non-Breaking Space
-snippet nbs
-	&nbsp;
-# ←
-snippet left
-	&#x2190;
-# →
-snippet right
-	&#x2192;
-# ↑
-snippet up
-	&#x2191;
-# ↓
-snippet down
-	&#x2193;
-# ↩
-snippet return
-	&#x21A9;
-# ⇤
-snippet backtab
-	&#x21E4;
-# ⇥
-snippet tab
-	&#x21E5;
-# ⇧
-snippet shift
-	&#x21E7;
-# ⌃
-snippet control
-	&#x2303;
-# ⌅
-snippet enter
-	&#x2305;
-# ⌘
-snippet command
-	&#x2318;
-# ⌥
-snippet option
-	&#x2325;
-# ⌦
-snippet delete
-	&#x2326;
-# ⌫
-snippet backspace
-	&#x232B;
-# ⎋
-snippet escape
-	&#x238B;
-# Generic Doctype
-snippet doctype HTML 4.01 Strict
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""
-	"http://www.w3.org/TR/html4/strict.dtd">
-snippet doctype HTML 4.01 Transitional
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""
-	"http://www.w3.org/TR/html4/loose.dtd">
-snippet doctype HTML 5
-	<!DOCTYPE HTML>
-snippet doctype XHTML 1.0 Frameset
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-snippet doctype XHTML 1.0 Strict
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-snippet doctype XHTML 1.0 Transitional
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-snippet doctype XHTML 1.1
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-# HTML Doctype 4.01 Strict
-snippet docts
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""
-	"http://www.w3.org/TR/html4/strict.dtd">
-# HTML Doctype 4.01 Transitional
-snippet doct
-	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""
-	"http://www.w3.org/TR/html4/loose.dtd">
-# HTML Doctype 5
-snippet doct5
-	<!DOCTYPE HTML>
-# XHTML Doctype 1.0 Frameset
-snippet docxf
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-# XHTML Doctype 1.0 Strict
-snippet docxs
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-# XHTML Doctype 1.0 Transitional
-snippet docxt
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-# XHTML Doctype 1.1
-snippet docx
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-snippet html
-	<html>
-	${1}
-	</html>
-snippet xhtml
-	<html xmlns="http://www.w3.org/1999/xhtml">
-	${1}
-	</html>
-snippet body
-	<body>
-		${1}
-	</body>
-snippet head
-	<head>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8"`Close()`>
-		
-		<title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
-		${2}
-	</head>
-snippet title
-	<title>${1:`substitute(Filename("", "Page Title"), "^.", "\u&", "")`}</title>${2}
-snippet script
-	<script type="text/javascript" charset="utf-8">
-		${1}
-	</script>${2}
-snippet scriptsrc
-	<script src="${1}.js" type="text/javascript" charset="utf-8"></script>${2}
-snippet style
-	<style type="text/css" media="${1:screen}">
-		${2}
-	</style>${3}
-snippet base
-	<base href="${1}" target="${2}"`Close()`>
-snippet r
-	<br`Close()[1:]`>
-snippet div
-	<div id="${1:name}">
-		${2}
-	</div>
-# Embed QT Movie
-snippet movie
-	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
-	 codebase="http://www.apple.com/qtactivex/qtplugin.cab">
-		<param name="src" value="$1"`Close()`>
-		<param name="controller" value="$4"`Close()`>
-		<param name="autoplay" value="$5"`Close()`>
-		<embed src="${1:movie.mov}"
-			width="${2:320}" height="${3:240}"
-			controller="${4:true}" autoplay="${5:true}"
-			scale="tofit" cache="true"
-			pluginspage="http://www.apple.com/quicktime/download/"
-		`Close()[1:]`>
-	</object>${6}
-snippet fieldset
-	<fieldset id="$1">
-		<legend>${1:name}</legend>
-	
-		${3}
-	</fieldset>
-snippet form
-	<form action="${1:`Filename('$1_submit')`}" method="${2:get}" accept-charset="utf-8">
-		${3}
-	
-		
-	<p><input type="submit" value="Continue &rarr;"`Close()`></p>
-	</form>
-snippet h1
-	<h1 id="${1:heading}">${2:$1}</h1>
-snippet input
-	<input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="${3}"`Close()`>${4}
-snippet label
-	<label for="${2:$1}">${1:name}</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="${5}" id="${6:$2}"`Close()`>${7}
-snippet link
-	<link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" charset="utf-8"`Close()`>${4}
-snippet mailto
-	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
-snippet meta
-	<meta name="${1:name}" content="${2:content}"`Close()`>${3}
-snippet opt
-	<option value="${1:option}">${2:$1}</option>${3}
-snippet optt
-	<option>${1:option}</option>${2}
-snippet select
-	<select name="${1:some_name}" id="${2:$1}">
-		<option value="${3:option}">${4:$3}</option>
-	</select>${5}
-snippet table
-	<table border="${1:0}">
-		<tr><th>${2:Header}</th></tr>
-		<tr><th>${3:Data}</th></tr>
-	</table>${4}
-snippet textarea
-	<textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">${4}</textarea>${5}
-snippet href
-	<a href="${1}">${2}</a>${3}
diff --git a/vim/snippets/archive/java.snippets b/vim/snippets/archive/java.snippets
deleted file mode 100755
index fd705cb..0000000
--- a/vim/snippets/archive/java.snippets
+++ /dev/null
@@ -1,78 +0,0 @@
-snippet main
-	public static void main (String [] args)
-	{
-		${1:/* code */}
-	}
-snippet pu
-	public
-snippet po
-	protected
-snippet pr
-	private
-snippet st
-	static
-snippet fi
-	final
-snippet ab
-	abstract
-snippet re
-	return
-snippet br
-	break;
-snippet de
-	default:
-		${1}
-snippet ca
-	catch(${1:Exception} ${2:e}) ${3}
-snippet th
-	throw 
-snippet sy
-	synchronized
-snippet im
-	import
-snippet j.u
-	java.util
-snippet j.i
-	java.io.
-snippet j.b
-	java.beans.
-snippet j.n
-	java.net.
-snippet j.m
-	java.math.
-snippet if
-	if (${1}) ${2}
-snippet el
-	else 
-snippet elif
-	else if (${1}) ${2}
-snippet wh
-	while (${1}) ${2}
-snippet for
-	for (${1}; ${2}; ${3}) ${4}
-snippet fore
-	for (${1} : ${2}) ${3}
-snippet sw
-	switch (${1}) ${2}
-snippet cs
-	case ${1}:
-		${2}
-	${3}
-snippet tc
-	public class ${1:`Filename()`} extends ${2:TestCase}
-snippet t
-	public void test${1:Name}() throws Exception ${2}
-snippet cl
-	class ${1:`Filename("", "untitled")`} ${2}
-snippet in
-	interface ${1:`Filename("", "untitled")`} ${2:extends Parent}${3}
-snippet m
-	${1:void} ${2:method}(${3}) ${4:throws }${5}
-snippet v
-	${1:String} ${2:var}${3: = null}${4};${5}
-snippet co
-	static public final ${1:String} ${2:var} = ${3};${4}
-snippet cos
-	static public final String ${1:var} = "${2}";${3}
-snippet as
-	assert ${1:test} : "${2:Failure message}";${3}
diff --git a/vim/snippets/archive/javascript.snippets b/vim/snippets/archive/javascript.snippets
deleted file mode 100755
index 51f5e05..0000000
--- a/vim/snippets/archive/javascript.snippets
+++ /dev/null
@@ -1,74 +0,0 @@
-# Prototype
-snippet proto
-	${1:class_name}.prototype.${2:method_name} =
-	function(${3:first_argument}) {
-		${4:// body...}
-	};
-# Function
-snippet fun
-	function ${1:function_name} (${2:argument}) {
-		${3:// body...}
-	}
-# Anonymous Function
-snippet f
-	function(${1}) {${2}};
-# if
-snippet if
-	if (${1:true}) {${2}};
-# if ... else
-snippet ife
-	if (${1:true}) {${2}}
-	else{${3}};
-# tertiary conditional
-snippet t
-	${1:/* condition */} ? ${2:a} : ${3:b}
-# switch
-snippet switch
-	switch(${1:expression}) {
-		case '${3:case}':
-			${4:// code}
-			break;
-		${5}
-		default:
-			${2:// code}
-	}
-# case
-snippet case
-	case '${1:case}':
-		${2:// code}
-		break;
-	${3}
-# for (...) {...}
-snippet for
-	for (var ${2:i} = 0; $2 < ${1:Things}.length; $2${3:++}) {
-		${4:$1[$2]}
-	};
-# for (...) {...} (Improved Native For-Loop)
-snippet forr
-	for (var ${2:i} = ${1:Things}.length - 1; $2 >= 0; $2${3:--}) {
-		${4:$1[$2]}
-	};
-# while (...) {...}
-snippet wh
-	while (${1:/* condition */}) {
-		${2:/* code */}
-	}
-# do...while
-snippet do
-	do {
-		${2:/* code */}
-	} while (${1:/* condition */});
-# Object Method
-snippet :f
-	${1:method_name}: function(${2:attribute}) {
-		${4}
-	}${3:,}
-# setTimeout function
-snippet timeout
-	setTimeout(function() {${3}}${2}, ${1:10};
-# Get Elements
-snippet get
-	getElementsBy${1:TagName}('${2}')${3}
-# Get Element
-snippet gett
-	getElementBy${1:Id}('${2}')${3}
diff --git a/vim/snippets/archive/objc.snippets b/vim/snippets/archive/objc.snippets
deleted file mode 100755
index 6d6bf60..0000000
--- a/vim/snippets/archive/objc.snippets
+++ /dev/null
@@ -1,189 +0,0 @@
-# #import <...>
-snippet imp
-	#import <${1:Cocoa/Cocoa.h}>${2}
-# #import "..."
-snippet Imp
-	#import "${1:`Filename()`.h}"${2}
-# @selector(...)
-snippet sel
-	@selector(${1:method}:)${3}
-# @"..." string
-snippet s
-	@"${1}"${2}
-# Object
-snippet o
-	${1:NSObject} *${2:foo} = [${3:$1 alloc}];${5}
-# NSLog(...)
-snippet log
-	NSLog(@"${1}"${2});${3}
-# Class
-snippet objc
-	@interface ${1:`Filename('', 'object')`} : ${2:NSObject}
-	{
-	}
-	@end
-	
-	@implementation $1
-	- (id) init
-	{
-		if (self = [super init])
-		{${3}
-		}
-		return self;
-	}
-	@end
-# Class Interface
-snippet clh
-	@interface ${1:`Filename('', 'object')`} : ${2:NSObject}
-	{${3}
-	}
-	${4}
-	@end
-# Class Implementation
-snippet clm
-	@implementation ${1:`Filename('', 'object')`} : ${2:NSObject}
-	- (id)init
-	{
-		if ((self = [super init]))
-		{$0
-		}
-		return self;
-	}
-	@end
-# Interface
-snippet int
-	@interface
-	${1}
-	@end
-# Implementation
-snippet impl
-	@implementation
-	${1}
-	@end
-snippet ibo
-	IBOutlet ${1:NSSomeClass} *${2:$1};
-# Category
-snippet cat
-	@interface ${1:NSObject} (${2:Category})
-	@end
-	
-	@implementation $1 ($2)
-	${3}
-	@end
-# Category Interface
-snippet cath
-	@interface ${1:NSObject} (${2:Category})
-	${3}
-	@end
-# NSArray
-snippet array
-	NSMutableArray *${1:array} = [NSMutable array];${2}
-# NSDictionary
-snippet dict
-	NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];${2}
-# NSBezierPath
-snippet bez
-	NSBezierPath *${1:path} = [NSBezierPath bezierPath];${2}
-# Method
-snippet m
-	- (${1:id})${2:method}
-	{
-		${3:return self;}
-	}
-# Method declaration
-snippet md
-	- (${1:id})${2:method};${3}
-# IBAction declaration
-snippet ibad
-	- (IBAction)${1:method};${2}
-# IBAction method
-snippet iba
-	- (IBAction)${1:method}
-	{
-		${2}
-	}
-# awakeFromNib method
-snippet wake
-	- (void)awakeFromNib
-	{
-		${1}
-	}
-# Class Method
-snippet M
-	+ (${1:id})${2:method}
-	{${3}
-		return nil;
-	}
-# Sub-method (Call super)
-snippet sm
-	- (${1:id})${2:method}
-	{
-		[super $2];${3}
-		return self;
-	}
-# Method: Initialize
-snippet I
-	+ (void) initialize
-	{
-		[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWIthObjectsAndKeys:
-			${1}@"value", @"key",
-			nil]];
-	}
-# Accessor Methods For:
-# Object
-snippet objacc
-	- (${1:id})${2:thing}
-	{
-		return $2;
-	}
-	
-	- (void)set$2:($1)${3:new$2}
-	{
-		[$3 retain];
-		[$2 release];
-		$2 = $3;
-	}${4}
-# for (object in array)
-snippet fora
-	for (${1:Class} *${2:Object} in ${3:array}) {
-		${4}
-	}
-snippet forarray
-	unsigned int ${1:object}Count = [${2:array} count];
-	
-	for (unsigned int index = 0; index < $1Count; index++) {
-		${3:id} $1 = [$2 $1AtIndex:index];
-		${4}
-	}
-# IBOutlet
-# @property (Objective-C 2.0)
-snippet prop
-	@property (${1:retain}) ${2:NSSomeClass} *${3:$2};${4}
-# @synthesize (Objective-C 2.0)
-snippet syn
-	@synthesize ${1:property};${2}
-# [[ alloc] init]
-snippet alloc
-	[[${1:foo} alloc] init]${2};${3}
-# retain
-snippet ret
-	[${1:foo} retain];${2}
-# release
-snippet rel
-	[${1:foo} release];
-	${2:$1 = nil;}	
-# autorelease
-snippet arel
-	[${1:foo} autorelease];
-# autorelease pool
-snippet pool
-	NSAutoReleasePool *${1:pool} = [[NSAutoReleasePool alloc] init];
-	${2:/* code */}
-	[$1 release];
-# Throw an exception
-snippet except
-	NSException *${1:badness};
-	$1 = [NSException exceptionWithName:@"${2:$1Name}"
-	                             reason:@"${3}"
-	                           userInfo:nil];
-	[$1 raise];
diff --git a/vim/snippets/archive/perl.snippets b/vim/snippets/archive/perl.snippets
deleted file mode 100755
index 8607fa4..0000000
--- a/vim/snippets/archive/perl.snippets
+++ /dev/null
@@ -1,91 +0,0 @@
-# #!/usr/bin/perl
-snippet #!
-	#!/usr/bin/perl
-	
-# Hash Pointer
-snippet .
-	 =>
-# Function
-snippet sub
-	sub ${1:function_name} {
-		${2:#body ...}
-	}
-# Conditional
-snippet if
-	if (${1}) {
-		${2:# body...}
-	}
-# Conditional if..else
-snippet ife
-	if (${1}) {
-		${2:# body...}
-	} else {
-		${3:# else...}
-	}
-# Conditional if..elsif..else
-snippet ifee
-	if (${1}) {
-		${2:# body...}
-	} elsif (${3}) {
-		${4:# elsif...}
-	} else {
-		${5:# else...}
-	}
-# Conditional One-line
-snippet xif
-	${1:expression} if ${2:condition};${3}
-# Unless conditional
-snippet unless
-	unless (${1}) {
-		${2:# body...}
-	}
-# Unless conditional One-line
-snippet xunless
-	${1:expression} unless ${2:condition};${3}
-# Try/Except
-snippet eval
-	eval {
-		${1:# do something risky...}
-	};
-	if ($@) {
-		${2:# handle failure...}
-	}
-# While Loop
-snippet wh
-	while (${1}) {
-		${2:# body...}
-	}
-# While Loop One-line
-snippet xwh
-	${1:expression} while ${2:condition};${3}
-# For Loop
-snippet for
-	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4:# body...}
-	}
-# Foreach Loop
-snippet fore
-	foreach my $${1:x} (@${2:array}) {
-		${3:# body...}
-	}
-# Foreach Loop One-line
-snippet xfore
-	${1:expression} foreach @${2:array};${3}
-# Package
-snippet cl
-	package ${1:ClassName};
-	
-	use base qw(${2:ParentClass});
-	
-	sub new {
-		my $class = shift;
-		$class = ref $class if ref $class;
-		my $self = bless {}, $class;
-		$self;
-	}
-	
-	1;${3}
-# Read File
-snippet slurp
-	my $${1:var};
-	{ local $/ = undef; local *FILE; open FILE, "<${2:file}"; $$1 = <FILE>; close FILE }${2}
diff --git a/vim/snippets/archive/php.snippets b/vim/snippets/archive/php.snippets
deleted file mode 100755
index 3ce9e26..0000000
--- a/vim/snippets/archive/php.snippets
+++ /dev/null
@@ -1,216 +0,0 @@
-snippet php
-	<?php
-	${1}
-	?>
-snippet ec
-	echo "${1:string}"${2};
-snippet inc
-	include '${1:file}';${2}
-snippet inc1
-	include_once '${1:file}';${2}
-snippet req
-	require '${1:file}';${2}
-snippet req1
-	require_once '${1:file}';${2}
-# $GLOBALS['...']
-snippet globals
-	$GLOBALS['${1:variable}']${2: = }${3:something}${4:;}${5}
-snippet $_ COOKIE['...']
-	$_COOKIE['${1:variable}']${2}
-snippet $_ ENV['...']
-	$_ENV['${1:variable}']${2}
-snippet $_ FILES['...']
-	$_FILES['${1:variable}']${2}
-snippet $_ Get['...']
-	$_GET['${1:variable}']${2}
-snippet $_ POST['...']
-	$_POST['${1:variable}']${2}
-snippet $_ REQUEST['...']
-	$_REQUEST['${1:variable}']${2}
-snippet $_ SERVER['...']
-	$_SERVER['${1:variable}']${2}
-snippet $_ SESSION['...']
-	$_SESSION['${1:variable}']${2}
-# Start Docblock
-snippet /*
-	/**
-	 * ${1}
-	 **/
-# Class - post doc
-snippet doc_cp
-	/**
-	 * ${1:undocumented class}
-	 *
-	 * @package ${2:default}
-	 * @author ${3:`g:snips_author`}
-	**/${4}
-# Class Variable - post doc
-snippet doc_vp
-	/**
-	 * ${1:undocumented class variable}
-	 *
-	 * @var ${2:string}
-	 **/${3}
-# Class Variable
-snippet doc_v
-	/**
-	 * ${3:undocumented class variable}
-	 *
-	 * @var ${4:string}
-	 **/
-	${1:var} $${2};${5}
-# Class
-snippet doc_c
-	/**
-	 * ${3:undocumented class}
-	 *
-	 * @packaged ${4:default}
-	 * @author ${5:`g:snips_author`}
-	 **/
-	${1:}class ${2:}
-	{${6}
-	} // END $1class $2
-# Constant Definition - post doc
-snippet doc_dp
-	/**
-	 * ${1:undocumented constant}
-	 **/${2}
-# Constant Definition
-snippet doc_d
-	/**
-	 * ${3:undocumented constant}
-	 **/
-	define(${1}, ${2});${4}
-# Function - post doc
-snippet doc_fp
-	/**
-	 * ${1:undocumented function}
-	 *
-	 * @return ${2:void}
-	 * @author ${3:`g:snips_author`}
-	 **/${4}
-# Function signature
-snippet doc_s
-	/**
-	 * ${4:undocumented function}
-	 *
-	 * @return ${5:void}
-	 * @author ${6:`g:snips_author`}
-	 **/
-	${1}function ${2}(${3});${7}
-# Function
-snippet doc_f
-	/**
-	 * ${4:undocumented function}
-	 *
-	 * @return ${5:void}
-	 * @author ${6:`g:snips_author`}
-	 **/
-	${1}function ${2}(${3})
-	{${7}
-	}
-# Header
-snippet doc_h
-	/**
-	 * ${1}
-	 *
-	 * @author ${2:`g:snips_author`}
-	 * @version ${3:$Id$}
-	 * @copyright ${4:$2}, `strftime('%d %B, %Y')`
-	 * @package ${5:default}
-	 **/
-	
-	/**
-	 * Define DocBlock
-	 *//
-# Interface
-snippet doc_i
-	/**
-	 * ${2:undocumented class}
-	 *
-	 * @package ${3:default}
-	 * @author ${4:`g:snips_author`}
-	 **/
-	interface ${1:}
-	{${5}
-	} // END interface $1
-# class ...
-snippet class
-	/**
-	 * ${1}
-	 **/
-	class ${2:ClassName}
-	{
-		${3}
-		function ${4:__construct}(${5:argument})
-		{
-			${6:// code...}
-		}
-	}
-# define(...)
-snippet def
-	define('${1}'${2});${3}
-# defined(...)
-snippet def?
-	${1}defined('${2}')${3}
-snippet wh
-	while (${1:/* condition */}) {
-		${2:// code...}
-	}
-# do ... while
-snippet do
-	do {
-		${2:// code... }
-	} while (${1:/* condition */});
-snippet if
-	if (${1:/* condition */}) {
-		${2:// code...}
-	}
-snippet ife
-	if (${1:/* condition */}) {
-		${2:// code...}
-	} else {
-		${3:// code...}
-	}
-	${4}
-snippet else
-	else {
-		${1:// code...}
-	}
-snippet elseif
-	elseif (${1:/* condition */}) {
-		${2:// code...}
-	}
-# Tertiary conditional
-snippet t
-	$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
-snippet switch
-	switch ($${1:variable}) {
-		case '${2:value}':
-			${3:// code...}
-			break;
-		${5}
-		default:
-			${4:// code...}
-			break;
-	}
-snippet case
-	case '${1:value}':
-		${2:// code...}
-		break;${3}
-snippet for
-	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-		${4: // code...}
-	}
-snippet foreach
-	foreach ($${1:variable} as $${2:key}) {
-		${3:// code...}
-	}
-snippet fun
-	${1:public }function ${2:FunctionName}(${3})
-	{
-		${4:// code...}
-	}
-# $... = array (...)
-snippet array
-	$${1:arrayName} = array('${2}' => ${3});${4}
diff --git a/vim/snippets/archive/python.snippets b/vim/snippets/archive/python.snippets
deleted file mode 100755
index af93a5b..0000000
--- a/vim/snippets/archive/python.snippets
+++ /dev/null
@@ -1,72 +0,0 @@
-snippet #!
-	#!/usr/bin/python
-	
-snippet wh
-	while ${1:condition}:
-		${2:# code...}
-snippet for
-	for ${1:needle} in ${2:haystack}:
-		${3:# code...}
-# New Class
-snippet cl
-	class ${1:ClassName}(${2:object}):
-		"""${3:docstring for $1}"""
-		def __init__(self, ${4:arg}):
-			${5:super($1, self).__init__()}
-			self.$4 = $4
-			${6}
-# New Function
-snippet def
-	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
-		"""${3:docstring for $1}"""
-		${4:pass}
-# New Method
-snippet defs
-	def ${1:mname}(self, ${2:arg})):
-		${3:pass}
-# New Property
-snippet property
-	def ${1:foo}():
-		doc = "${2:The $1 property.}"
-		def fget(self):
-				${3:return self._$1}
-		def fset(self, value):
-			
-# Self
-snippet .
-	self.
-snippet try Try/Except
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-snippet try Try/Except/Else
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	else:
-		${5:pass}
-snippet try Try/Except/Finally
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	finally:
-		${5:pass}
-snippet try Try/Except/Else/Finally
-	try:
-		${1:pass}
-	except ${2:Exception}, ${3:e}:
-		${4:raise $3}
-	else:
-		${5:pass}
-	finally:
-		${6:pass}
-# if __name__ == '__main__':
-snippet ifmain
-	if __name__ == '__main__':
-		${1:main()}
-# __magic__
-snippet _
-	__${1:init}__${2}
diff --git a/vim/snippets/archive/ruby.snippets b/vim/snippets/archive/ruby.snippets
deleted file mode 100755
index 2ff480f..0000000
--- a/vim/snippets/archive/ruby.snippets
+++ /dev/null
@@ -1,445 +0,0 @@
-snippet #!
-	#!/usr/bin/ruby
-	
-snippet =b
-	=begin rdoc
-		${1}
-	=end
-snippet y
-	:yields: ${1:arguments}
-snippet rb
-	#!/usr/bin/env ruby -wKU
-	
-snippet req
-	require "${1}"${2}
-snippet #
-	# =>
-snippet end
-	__END__
-snippet case
-	case ${1:object}
-	when ${2:condition}
-		${3}
-	end
-snippet when
-	when ${1:condition}
-		${2}
-snippet def
-	def ${1:method_name}
-		${2}
-	end
-snippet deft
-	def test_${1:case_name}
-		${2}
-	end
-snippet if
-	if ${1:condition}
-		${2}
-	end
-snippet ife
-	if ${1:condition}
-		${2}
-	else
-		${3}
-	end
-snippet elsif
-	elsif ${1:condition}
-		${2}
-snippet unless
-	unless ${1:condition}
-		${2}
-	end
-snippet while
-	while ${1:condition}
-		${2}
-	end
-snippet until
-	until ${1:condition}
-		${2}
-	end
-snippet cla class .. end
-	class ${1:`substitute(Filename(), '^.', '\u&', '')`}
-		${2}
-	end
-snippet cla class .. initialize .. end
-	class ${1:`substitute(Filename(), '^.', '\u&', '')`}
-		def initialize(${2:args})
-			${3}
-		end
-	
-	
-	end
-snippet cla class .. < ParentClass .. initialize .. end
-	class ${1:`substitute(Filename(), '^.', '\u&', '')`} < ${2:ParentClass}
-		def initialize(${3:args})
-			${4}
-		end
-	
-	
-	end
-snippet cla ClassName = Struct .. do .. end
-	${1:`substitute(Filename(), '^.', '\u&', '')`} = Struct.new(:${2:attr_names}) do
-		def ${3:method_name}
-			${4}
-		end
-	
-	
-	end
-snippet cla class BlankSlate .. initialize .. end
-	class ${1:BlankSlate}
-		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A__/ }
-snippet cla class << self .. end
-	class << ${1:self}
-		${2}
-	end
-# class .. < DelegateClass .. initialize .. end
-snippet cla-
-	class ${1:`substitute(Filename(), '^.', '\u&', '')`} < DelegateClass(${2:ParentClass})
-		def initialize(${3:args})
-			super(${4:del_obj})
-	
-			${5}
-		end
-	
-	
-	end
-snippet mod module .. end
-	module ${1:`substitute(Filename(), '^.', '\u&', '')`}
-		${2}
-	end
-snippet mod module .. module_function .. end
-	module ${1:`substitute(Filename(), '^.', '\u&', '')`}
-		module_function
-	
-		${2}
-	end
-snippet mod module .. ClassMethods .. end
-	module ${1:`substitute(Filename(), '^.', '\u&', '')`}
-		module ClassMethods
-			${2}
-		end
-	
-		
-# attr_reader
-snippet r
-	attr_reader :${1:attr_names}
-# attr_writer
-snippet w
-	attr_writer :${1:attr_names}
-# attr_accessor
-snippet rw
-	attr_accessor :${1:attr_names}
-# include Enumerable
-snippet Enum
-	include Enumerable
-	
-	def each(&block)
-		${1}
-	end
-# include Comparable
-snippet Comp
-	include Comparable
-	
-	def <=>(other)
-		${1}
-	end
-# extend Forwardable
-snippet Forw-
-	extend Forwardable
-# def self
-snippet defs
-	def self.${1:class_method_name}
-		${2}
-	end
-# def method_missing
-snippet defmm
-	def method_missing(meth, *args, &blk)
-		${1}
-	end
-snippet defd
-	def_delegator :${1:@del_obj}, :${2:del_meth}, :${3:new_name}
-snippet defds
-	def_delegators :${1:@del_obj}, :${2:del_methods}
-snippet am
-	alias_method :${1:new_name}, :${2:old_name}
-snippet app
-	if __FILE__ == $PROGRAM_NAME
-		${1}
-	end
-# usage_if()
-snippet usai
-	if ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}
-	end
-# usage_unless()
-snippet usau
-	unless ARGV.${1}
-		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${3}
-	end
-snippet array
-	Array.new(${1:10}) { |${2:i}| ${3} }
-snippet hash
-	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${3} }
-snippet file File.foreach() { |line| .. }
-	File.foreach(${1:"path/to/file"}) { |${2:line}| ${3} }
-snippet file File.read()
-	File.read(${1:"path/to/file"})${2}
-snippet Dir Dir.global() { |file| .. }
-	Dir.glob(${1:"dir/glob/*"}) { |${2:file}| ${3} }
-snippet Dir Dir[''..'']
-	Dir[${1:"glob/**/*.rb"}]${2}
-snippet dir
-	Filename.dirname(__FILE__)
-snippet deli
-	delete_if { |${1:e}| ${2} }
-snippet fil
-	fill(${1:range}) { |${2:i}| ${3} }
-# flatten_once()
-snippet flao
-	inject(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2)}${3}
-snippet zip
-	zip(${1:enums}) { |${2:row}| ${3} }
-# downto(0) { |n| .. }
-snippet dow
-	downto(${1:0}) { |${2:n}| ${3} }
-snippet ste
-	step(${1:2}) { |${2:n}| ${3} }
-snippet tim
-	times { |${1:n}| ${2} }
-snippet upt
-	upto(${1:1.0/0.0}) { |${2:n}| ${3} }
-snippet loo
-	loop { ${1} }
-snippet ea
-	each { |${1:e}| ${2} }
-snippet eab
-	each_byte { |${1:byte}| ${2} }
-snippet eac- each_char { |chr| .. }
-	each_char { |${1:chr}| ${2} }
-snippet eac- each_cons(..) { |group| .. }
-	each_cons(${1:2}) { |${2:group}| ${3} }
-snippet eai
-	each_index { |${1:i}| ${2} }
-snippet eak
-	each_key { |${1:key}| ${2} }
-snippet eal
-	each_line { |${1:line}| ${2} }
-snippet eap
-	each_pair { |${1:name}, ${2:val}| ${3} }
-snippet eas-
-	each_slice(${1:2}) { |${2:group}| ${3} }
-snippet eav
-	each_value { |${1:val}| ${2} }
-snippet eawi
-	each_with_index { |${1:e}, ${2:i}| ${3} }
-snippet reve
-	reverse_each { |${1:e}| ${2} }
-snippet inj
-	inject(${1:init}) { |${2:mem}, ${3:var}| ${4} }
-snippet map
-	map { |${1:e}| ${2} }
-snippet mapwi-
-	enum_with_index.map { |${1:e}, ${2:i}| ${3} }
-snippet sor
-	sort { |a, b| ${1} }
-snippet sorb
-	sort_by { |${1:e}| ${2} }
-snippet ran
-	sort_by { rand }
-snippet all
-	all? { |${1:e}| ${2} }
-snippet any
-	any? { |${1:e}| ${2} }
-snippet cl
-	classify { |${1:e}| ${2} }
-snippet col
-	collect { |${1:e}| ${2} }
-snippet det
-	detect { |${1:e}| ${2} }
-snippet fet
-	fetch(${1:name}) { |${2:key}| ${3} }
-snippet fin
-	find { |${1:e}| ${2} }
-snippet fina
-	find_all { |${1:e}| ${2} }
-snippet gre
-	grep(${1:/pattern/}) { |${2:match}| ${3} }
-snippet sub
-	${1:g}sub(${2:/pattern/}) { |${3:match}| ${4} }
-snippet sca
-	scan(${1:/pattern/}) { |${2:match}| ${3} }
-snippet max
-	max { |a, b|, ${1} }
-snippet min
-	min { |a, b|, ${1} }
-snippet par
-	partition { |${1:e}|, ${2} }
-snippet rej
-	reject { |${1:e}|, ${2} }
-snippet sel
-	select { |${1:e}|, ${2} }
-snippet lam
-	lambda { |${1:args}| ${2} }
-snippet do
-	do |${1:variable}|
-		${2}
-	end
-snippet :
-	:${1:key} => ${2:"value"}${3}
-snippet ope
-	open(${1:"path/or/url/or/pipe"}, "${2:w}") { |${3:io}| ${4} }
-# path_from_here()
-snippet patfh
-	File.join(File.dirname(__FILE__), *%2[${1:rel path here}])${2}
-# unix_filter {}
-snippet unif
-	ARGF.each_line${1} do |${2:line}|
-		${3}
-	end
-# option_parse {}
-snippet optp
-	require "optparse"
-	
-	options = {${1:default => "args"}}
-	
-	ARGV.options do |opts|
-		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}
-snippet opt
-	opts.on( "-${1:o}", "--${2:long-option-name}", ${3:String},
-	         "${4:Option description.}") do |${5:opt}|
-		${6}
-	end
-snippet tc
-	require "test/unit"
-	
-	require "${1:library_file_name}"
-	
-	class Test${2:$1} < Test::Unit::TestCase
-		def test_${3:case_name}
-			${4}
-		end
-	end
-snippet ts
-	require "test/unit"
-	
-	require "tc_${1:test_case_file}"
-	require "tc_${2:test_case_file}"${3}
-snippet as
-	assert(${1:test}, "${2:Failure message.}")${3}
-snippet ase
-	assert_equal(${1:expected}, ${2:actual})${3}
-snippet asne
-	assert_not_equal(${1:unexpected}, ${2:actual})${3}
-snippet asid
-	assert_in_delta(${1:expected_float}, ${2:actual_float}, ${3:2 ** -20})${4}
-snippet asio
-	assert_instance_of(${1:ExpectedClass}, ${2:actual_instance})${3}
-snippet asko
-	assert_kind_of(${1:ExpectedKind}, ${2:actual_instance})${3}
-snippet asn
-	assert_nil(${1:instance})${2}
-snippet asnn
-	assert_not_nil(${1:instance})${2}
-snippet asm
-	assert_match(/${1:expected_pattern}/, ${2:actual_string})${3}
-snippet asnm
-	assert_no_match(/${1:unexpected_pattern}/, ${2:actual_string})${3}
-snippet aso
-	assert_operator(${1:left}, :${2:operator}, ${3:right})${4}
-snippet asr
-	assert_raise(${1:Exception}) { ${2} }
-snippet asnr
-	assert_nothing_raised(${1:Exception}) { ${2} }
-snippet asrt
-	assert_respond_to(${1:object}, :${2:method})${3}
-snippet ass assert_same(..)
-	assert_same(${1:expected}, ${2:actual})${3}
-snippet ass assert_send(..)
-	assert_send([${1:object}, :${2:message}, ${3:args}])${4}
-snippet asns
-	assert_not_same(${1:unexpected}, ${2:actual})${3}
-snippet ast
-	assert_throws(:${1:expected}) { ${2} }
-snippet asnt
-	assert_nothing_thrown { ${1} }
-snippet fl
-	flunk("${1:Failure message.}")${2}
-# Benchmark.bmbm do .. end
-snippet bm-
-	TESTS = ${1:10_000}
-	Benchmark.bmbm do |results|
-		${2}
-	end
-snippet rep
-	results.report("${1:name}:") { TESTS.times { ${2} }}
-# Marshal.dump(.., file)
-snippet Md
-	File.open(${1:"path/to/file.dump"}, "wb") { |${2:file}| Marshal.dump(${3:obj}, $2) }${4}
-# Mashal.load(obj)
-snippet Ml
-	File.open(${1:"path/to/file.dump"}, "rb") { |${2:file}| Marshal.load($2) }${3}
-# deep_copy(..)
-snippet deec
-	Marshal.load(Marshal.dump(${1:obj_to_copy}))${2}
-snippet Pn-
-	PStore.new(${1:"file_name.pstore"})${2}
-snippet tra
-	transaction(${1:true}) { ${2} }
-# xmlread(..)
-snippet xml-
-	REXML::Document.new(File.read(${1:"path/to/file"}))${2}
-# xpath(..) { .. }
-snippet xpa
-	elements.each(${1:"//Xpath"}) do |${2:node}|
-		${3}
-	end
-# class_from_name()
-snippet clafn
-	split("::").inject(Object) { |par, const| par.const_get(const) }
-# singleton_class()
-snippet sinc
-	class << self; self end
-snippet nam
-	namespace :${1:`Filename()`} do
-		${2}
-	end
-snippet tas
-	desc "${1:Task description\}"
-	task :${2:task_name => [:dependent, :tasks]} do
-		${3}
-	end
-snippet trace
-	begin
-	  ${1:# do stuff here}
-	rescue Exception => e
-	  puts "Exception: #{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
-	  ${2:exit 1}
-	end
-snippet begin
-	begin
-	  ${3:# do stuff here}
-	rescue ${1:Exception} => ${2:e}
-	  ${4:exit 1}
-	end
-snippet before
-	before(${1::each}) do
-	  ${2}
-	end
-snippet it
-	it "should ${1}" do
-	  ${2}
-	end
-snippet desc
-	describe "${1}" do
-	  ${2}
-	end
-snippet %x
-	%x{ ${1} }
-snippet %w
-	%w{ ${1} }
-snippet %r
-	%r{ ${1} }
-snippet puts
-	puts "${1}"${2}
-
-
diff --git a/vim/snippets/archive/sh.snippets b/vim/snippets/archive/sh.snippets
deleted file mode 100755
index c26ffbd..0000000
--- a/vim/snippets/archive/sh.snippets
+++ /dev/null
@@ -1,28 +0,0 @@
-# #!/bin/bash
-snippet #!
-	#!/bin/bash
-	
-snippet if
-	if [[ ${1:condition} ]]; then
-		${2:#statements}
-	fi
-snippet elif
-	elif [[ ${1:condition} ]]; then
-		${2:#statements}
-snippet for
-	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-		${3:#statements}
-	done
-snippet wh
-	while [[ ${1:condition} ]]; do
-		${2:#statements}
-	done
-snippet until
-	[[ ${1:condition} ]]; do
-		${2:#statements}
-	done
-snippet case
-	case ${1:word} in
-		${2:pattern})
-			${3};;
-	esac
diff --git a/vim/snippets/archive/snippet.snippets b/vim/snippets/archive/snippet.snippets
deleted file mode 100755
index 854c058..0000000
--- a/vim/snippets/archive/snippet.snippets
+++ /dev/null
@@ -1,7 +0,0 @@
-# snippets for making snippets :)
-snippet snip
-	snippet ${1:trigger}
-		${2}
-snippet msnip
-	snippet ${1:trigger} ${2:description}
-		${3}
diff --git a/vim/snippets/archive/tex.snippets b/vim/snippets/archive/tex.snippets
deleted file mode 100755
index 22f7316..0000000
--- a/vim/snippets/archive/tex.snippets
+++ /dev/null
@@ -1,115 +0,0 @@
-# \begin{}...\end{}
-snippet begin
-	\begin{${1:env}}
-		${2}
-	\end{$1}
-# Tabular
-snippet tab
-	\begin{${1:tabular}}{${2:c}}
-	${3}
-	\end{$1}
-# Align(ed)
-snippet ali
-	\begin{align${1:ed}}
-		${2}
-	\end{align$1}
-# Gather(ed)
-snippet gat
-	\begin{gather${1:ed}}
-		${2}
-	\end{gather$1}
-# Equation
-snippet eq
-	\begin{equation}
-		${1}
-	\end{equation}
-# Unnumbered Equation
-snippet \
-	\\[
-		${1}
-	\\]
-# Enumerate
-snippet enum
-	\begin{enumerate}
-		\item ${1}
-	\end{enumerate}
-# Itemize
-snippet item
-	\begin{itemize}
-		\item ${1}
-	\end{itemize}
-# Description
-snippet desc
-	\begin{description}
-		\item[${1}] ${2}
-	\end{description}
-# Matrix
-snippet mat
-	\begin{${1:p/b/v/V/B/small}matrix}
-		${2}
-	\end{$1matrix}
-# Cases
-snippet cas
-	\begin{cases}
-		${1:equation}, &\text{ if }${2:case}\\
-		${3}
-	\end{cases}
-# Split
-snippet spl
-	\begin{split}
-		${1}
-	\end{split}
-# Part
-snippet part
-	\part{${1:part name}} % (fold)
-	\label{prt:${2:$1}}
-	${3}
-	% part $2 (end)
-# Chapter
-snippet cha
-	\chapter{${1:chapter name}} % (fold)
-	\label{cha:${2:$1}}
-	${3}
-	% chapter $2 (end)
-# Section
-snippet sec
-	\section{${1:section name}} % (fold)
-	\label{sec:${2:$1}}
-	${3}
-	% section $2 (end)
-# Sub Section
-snippet sub
-	\subsection{${1:subsection name}} % (fold)
-	\label{sub:${2:$1}}
-	${3}
-	% subsection $2 (end)
-# Sub Sub Section
-snippet subs
-	\subsubsection{${1:subsubsection name}} % (fold)
-	\label{ssub:${2:$1}}
-	${3}
-	% subsubsection $2 (end)
-# Paragraph
-snippet par
-	\paragraph{${1:paragraph name}} % (fold)
-	\label{par:${2:$1}}
-	${3}
-	% paragraph $2 (end)
-# Sub Paragraph
-snippet subp
-	\subparagraph{${1:subparagraph name}} % (fold)
-	\label{subp:${2:$1}}
-	${3}
-	% subparagraph $2 (end)
-snippet itd
-	\item[${1:description}] ${2:item}
-snippet figure
-	${1:Figure}~\ref{${2:fig:}}${3}
-snippet table
-	${1:Table}~\ref{${2:tab:}}${3}
-snippet listing
-	${1:Listing}~\ref{${2:list}}${3}
-snippet section
-	${1:Section}~\ref{${2:sec:}}${3}
-snippet page
-	${1:page}~\pageref{${2}}${3}
diff --git a/vim/snippets/archive/vim.snippets b/vim/snippets/archive/vim.snippets
deleted file mode 100755
index 64e7807..0000000
--- a/vim/snippets/archive/vim.snippets
+++ /dev/null
@@ -1,32 +0,0 @@
-snippet header
-	" File: ${1:`expand('%:t')`}
-	" Author: ${2:`g:snips_author`}
-	" Description: ${3}
-	${4:" Last Modified: `strftime("%B %d, %Y")`}
-snippet guard
-	if exists('${1:did_`Filename()`}') || &cp${2: || version < 700}
-		finish
-	endif
-	let $1 = 1${3}
-snippet f
-	fun ${1:function_name}(${2})
-		${3:" code}
-	endf
-snippet for
-	for ${1:needle} in ${2:haystack}
-		${3:" code}
-	endfor
-snippet wh
-	while ${1:condition}
-		${2:" code}
-	endw
-snippet if
-	if ${1:condition}
-		${2:" code}
-	endif
-snippet ife
-	if ${1:condition}
-		${2}
-	else
-		${3}
-	endif
diff --git a/vim/snippets/c/cl.snippet b/vim/snippets/c/cl.snippet
deleted file mode 100755
index 8196287..0000000
--- a/vim/snippets/c/cl.snippet
+++ /dev/null
@@ -1,7 +0,0 @@
-class ${1:`Filename('$1_t', 'name')`} {
-	public:
-		$1 (${2:arguments});
-		virtual ~$1 ();
-	private:
-		${3:/* data */}
-};
diff --git a/vim/snippets/c/def.snippet b/vim/snippets/c/def.snippet
deleted file mode 100755
index 35f7331..0000000
--- a/vim/snippets/c/def.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef $1
-#define ${1:SYMBOL} ${2:value}
-#endif${3}
diff --git a/vim/snippets/c/do.snippet b/vim/snippets/c/do.snippet
deleted file mode 100755
index 9435f15..0000000
--- a/vim/snippets/c/do.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-do {
-	${2:/* code */}
-} while (${1:/* condition */});
diff --git a/vim/snippets/c/el.snippet b/vim/snippets/c/el.snippet
deleted file mode 100755
index 5966669..0000000
--- a/vim/snippets/c/el.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-else {
-	${1}
-}
diff --git a/vim/snippets/c/for.snippet b/vim/snippets/c/for.snippet
deleted file mode 100755
index 58d6c36..0000000
--- a/vim/snippets/c/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
-	${4:/* code */}
-}
diff --git a/vim/snippets/c/forr.snippet b/vim/snippets/c/forr.snippet
deleted file mode 100755
index ea5b430..0000000
--- a/vim/snippets/c/forr.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for (${1:i} = 0; ${2:$1 < 5}; $1${3:++}) {
-	${4:/* code */}
-}
diff --git a/vim/snippets/c/fpf.snippet b/vim/snippets/c/fpf.snippet
deleted file mode 100755
index 53aed56..0000000
--- a/vim/snippets/c/fpf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-fprintf(${1:stderr}, "${2:%s}\n"${3});${4}
diff --git a/vim/snippets/c/fun.snippet b/vim/snippets/c/fun.snippet
deleted file mode 100755
index b9d7663..0000000
--- a/vim/snippets/c/fun.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-${1:void} ${2:function_name} (${3})
-{
-	${4:/* code */}
-}
diff --git a/vim/snippets/c/if.snippet b/vim/snippets/c/if.snippet
deleted file mode 100755
index df32c28..0000000
--- a/vim/snippets/c/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if (${1:/* condition */}) {
-	${2:/* code */}
-}
diff --git a/vim/snippets/c/inc/inc.snippet b/vim/snippets/c/inc/inc.snippet
deleted file mode 100755
index 302edff..0000000
--- a/vim/snippets/c/inc/inc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-#include "${1:`Filename("$1.h")`}"${2}
diff --git a/vim/snippets/c/inc/inc_global.snippet b/vim/snippets/c/inc/inc_global.snippet
deleted file mode 100755
index cf04993..0000000
--- a/vim/snippets/c/inc/inc_global.snippet
+++ /dev/null
@@ -1 +0,0 @@
-#include <${1:stdio}.h>${2}
diff --git a/vim/snippets/c/main.snippet b/vim/snippets/c/main.snippet
deleted file mode 100755
index 6a3c52f..0000000
--- a/vim/snippets/c/main.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-int main (int argc, char const* argv[]) {
-	${1:/* code */}
-	return 0;
-}
diff --git a/vim/snippets/c/map.snippet b/vim/snippets/c/map.snippet
deleted file mode 100755
index 59c4205..0000000
--- a/vim/snippets/c/map.snippet
+++ /dev/null
@@ -1 +0,0 @@
-std::map<${1:key}, ${2:value}> map${3};
diff --git a/vim/snippets/c/ns.snippet b/vim/snippets/c/ns.snippet
deleted file mode 100755
index d9b0b33..0000000
--- a/vim/snippets/c/ns.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace ${1:`Filename('', 'my')`} {
-	${2}
-} /* $1 */
diff --git a/vim/snippets/c/once.snippet b/vim/snippets/c/once.snippet
deleted file mode 100755
index 7b70667..0000000
--- a/vim/snippets/c/once.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef ${1:`toupper(Filename('', 'UNTITLED').'_'.system("/usr/bin/ruby -e 'print (rand * 2821109907455).round.to_s(36)'"))`}
-#define $1
-
-${2}
-
-#endif /* end of include guard: $1 */
diff --git a/vim/snippets/c/pr.snippet b/vim/snippets/c/pr.snippet
deleted file mode 100755
index 0dd78dc..0000000
--- a/vim/snippets/c/pr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-printf("${1:%s}\n"${2});${3}
diff --git a/vim/snippets/c/readfile.snippet b/vim/snippets/c/readfile.snippet
deleted file mode 100755
index 9aaf9c3..0000000
--- a/vim/snippets/c/readfile.snippet
+++ /dev/null
@@ -1,7 +0,0 @@
-std::vector<char> v;
-if (FILE *${2:fp} = fopen(${1:"filename"}, "r")) {
-	char buf[1024];
-	while (size_t len = fread(buf, 1, sizeof(buf), $2))
-		v.insert(v.end(), buf, buf + len);
-	fclose($2);
-}${3}
diff --git a/vim/snippets/c/st.snippet b/vim/snippets/c/st.snippet
deleted file mode 100755
index 95b798a..0000000
--- a/vim/snippets/c/st.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-struct ${1:`Filename('$1_t', 'name')`} {
-	${2:/* data */}
-}${3: /* optional variable list */};${4}
diff --git a/vim/snippets/c/t.snippet b/vim/snippets/c/t.snippet
deleted file mode 100755
index dbc2f2b..0000000
--- a/vim/snippets/c/t.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:/* condition */} ? ${2:a} : ${3:b}'
diff --git a/vim/snippets/c/td.snippet b/vim/snippets/c/td.snippet
deleted file mode 100755
index 61b147a..0000000
--- a/vim/snippets/c/td.snippet
+++ /dev/null
@@ -1 +0,0 @@
-typedef ${1:int} ${2:MyCustomType};
diff --git a/vim/snippets/c/tds.snippet b/vim/snippets/c/tds.snippet
deleted file mode 100755
index fea80d2..0000000
--- a/vim/snippets/c/tds.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-typedef struct {
-	${2:/* data */}
-} ${1:`Filename('$1_t', 'name')`};
diff --git a/vim/snippets/c/vector.snippet b/vim/snippets/c/vector.snippet
deleted file mode 100755
index f26dc22..0000000
--- a/vim/snippets/c/vector.snippet
+++ /dev/null
@@ -1 +0,0 @@
-std::vector<${1:char}> v${2};
diff --git a/vim/snippets/c/wh.snippet b/vim/snippets/c/wh.snippet
deleted file mode 100755
index 318ca59..0000000
--- a/vim/snippets/c/wh.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-while (${1:/* condition */}) {
-	${2:/* code */}
-}
diff --git a/vim/snippets/cmake/bin.snippet b/vim/snippets/cmake/bin.snippet
deleted file mode 100755
index 7e91c8e..0000000
--- a/vim/snippets/cmake/bin.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	ADD_EXECUTABLE(${1:bin})
diff --git a/vim/snippets/cmake/cmake.snippet b/vim/snippets/cmake/cmake.snippet
deleted file mode 100755
index 9792736..0000000
--- a/vim/snippets/cmake/cmake.snippet
+++ /dev/null
@@ -1,16 +0,0 @@
-	CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-	PROJECT(${1:ProjectName})
-
-	FIND_PACKAGE(${2:LIBRARY})
-
-	INCLUDE_DIRECTORIES(
-		${$2_INCLUDE_DIR}
-	)
-
-	ADD_SUBDIRECTORY(${3:src})
-
-	ADD_EXECUTABLE($1)
-
-	TARGET_LINK_LIBRARIES($1
-		${$2_LIBRARIES}
-	)
diff --git a/vim/snippets/cmake/dep.snippet b/vim/snippets/cmake/dep.snippet
deleted file mode 100755
index d5b2460..0000000
--- a/vim/snippets/cmake/dep.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	ADD_DEPENDENCIES(${1:target}
-		${2:dep}
-	)
diff --git a/vim/snippets/cmake/find.snippet b/vim/snippets/cmake/find.snippet
deleted file mode 100755
index 039f9a4..0000000
--- a/vim/snippets/cmake/find.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	FIND_PACKAGE(${1:LIBRARY})
diff --git a/vim/snippets/cmake/glob.snippet b/vim/snippets/cmake/glob.snippet
deleted file mode 100755
index 6eb5b7f..0000000
--- a/vim/snippets/cmake/glob.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	FILE(GLOB ${1:SRCS} *.${2:cpp})
diff --git a/vim/snippets/cmake/include.snippet b/vim/snippets/cmake/include.snippet
deleted file mode 100755
index ad65b11..0000000
--- a/vim/snippets/cmake/include.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	INCLUDE_DIRECTORIES(
-		${${1:INCLUDE_DIR}}
-	)
diff --git a/vim/snippets/cmake/lib.snippet b/vim/snippets/cmake/lib.snippet
deleted file mode 100755
index 30f9095..0000000
--- a/vim/snippets/cmake/lib.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	ADD_LIBRARY(${1:lib} ${2:STATIC}
-		${${3:SRCS}}
-	)
diff --git a/vim/snippets/cmake/link.snippet b/vim/snippets/cmake/link.snippet
deleted file mode 100755
index b795511..0000000
--- a/vim/snippets/cmake/link.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	TARGET_LINK_LIBRARIES(${1:bin}
-		${2:somelib}
-	)
diff --git a/vim/snippets/cmake/props.snippet b/vim/snippets/cmake/props.snippet
deleted file mode 100755
index 6cfa0b0..0000000
--- a/vim/snippets/cmake/props.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-	SET_TARGET_PROPERTIES(${1:target} 
-		${2:PROPERTIES} ${3:COMPILE_FLAGS} 
-		${4:"-O3 -Wall -pedantic"}
-	)
diff --git a/vim/snippets/cmake/set.snippet b/vim/snippets/cmake/set.snippet
deleted file mode 100755
index 6956269..0000000
--- a/vim/snippets/cmake/set.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	SET(${1:var} ${2:val})
diff --git a/vim/snippets/cmake/subdir.snippet b/vim/snippets/cmake/subdir.snippet
deleted file mode 100755
index 0f94660..0000000
--- a/vim/snippets/cmake/subdir.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	ADD_SUBDIRECTORY(${1:src})
diff --git a/vim/snippets/css/!.snippet b/vim/snippets/css/!.snippet
deleted file mode 100755
index 462b9b5..0000000
--- a/vim/snippets/css/!.snippet
+++ /dev/null
@@ -1 +0,0 @@
-!important
diff --git a/vim/snippets/css/#.snippet b/vim/snippets/css/#.snippet
deleted file mode 100755
index 5a92681..0000000
--- a/vim/snippets/css/#.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-#${1:id} {
-  ${2}
-}
diff --git a/vim/snippets/css/background/all.snippet b/vim/snippets/css/background/all.snippet
deleted file mode 100755
index 5e94d2c..0000000
--- a/vim/snippets/css/background/all.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background:${6: #${1:DDD}} url($2) ${3:repeat/repeat-x/repeat-y/no-repeat} ${4:scroll/fixed} ${5:top left/top center/top right/center left/center center/center right/bottom left/bottom center/bottom right/x-% y-%/x-pos y-pos};$0
diff --git a/vim/snippets/css/background/attachment.snippet b/vim/snippets/css/background/attachment.snippet
deleted file mode 100755
index cb0c8f8..0000000
--- a/vim/snippets/css/background/attachment.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-attachment: ${1:scroll/fixed};$0
diff --git a/vim/snippets/css/background/color.snippet b/vim/snippets/css/background/color.snippet
deleted file mode 100755
index ebf4bc7..0000000
--- a/vim/snippets/css/background/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-color: #${1:DDD};$0
diff --git a/vim/snippets/css/background/color_name.snippet b/vim/snippets/css/background/color_name.snippet
deleted file mode 100755
index c736f99..0000000
--- a/vim/snippets/css/background/color_name.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-color: ${1:red};$0
diff --git a/vim/snippets/css/background/color_rgb.snippet b/vim/snippets/css/background/color_rgb.snippet
deleted file mode 100755
index a818f86..0000000
--- a/vim/snippets/css/background/color_rgb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-color: rgb(${1:255},${2:255},${3:255});$0
diff --git a/vim/snippets/css/background/color_transparent.snippet b/vim/snippets/css/background/color_transparent.snippet
deleted file mode 100755
index d4ecdd1..0000000
--- a/vim/snippets/css/background/color_transparent.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-color: transparent;$0
diff --git a/vim/snippets/css/background/image_none.snippet b/vim/snippets/css/background/image_none.snippet
deleted file mode 100755
index 1112ab7..0000000
--- a/vim/snippets/css/background/image_none.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-image: none;$0
diff --git a/vim/snippets/css/background/image_url.snippet b/vim/snippets/css/background/image_url.snippet
deleted file mode 100755
index 83bee3e..0000000
--- a/vim/snippets/css/background/image_url.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-image: url($1);$0
diff --git a/vim/snippets/css/background/position.snippet b/vim/snippets/css/background/position.snippet
deleted file mode 100755
index ccdcb69..0000000
--- a/vim/snippets/css/background/position.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-position: ${1:top left/top center/top right/center left/center center/center right/bottom left/bottom center/bottom right/x-% y-%/x-pos y-pos};$0
diff --git a/vim/snippets/css/background/repeat.snippet b/vim/snippets/css/background/repeat.snippet
deleted file mode 100755
index 5c6ce16..0000000
--- a/vim/snippets/css/background/repeat.snippet
+++ /dev/null
@@ -1 +0,0 @@
-background-repeat: ${1:repeat/repeat-x/repeat-y/no-repeat};$0
diff --git a/vim/snippets/css/border/basic.snippet b/vim/snippets/css/border/basic.snippet
deleted file mode 100755
index bb6adc0..0000000
--- a/vim/snippets/css/border/basic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border: ${1:1px} ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/border/color.snippet b/vim/snippets/css/border/color.snippet
deleted file mode 100755
index b3e7721..0000000
--- a/vim/snippets/css/border/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-color: ${1:999};$0
diff --git a/vim/snippets/css/border/style.snippet b/vim/snippets/css/border/style.snippet
deleted file mode 100755
index 0dac5f1..0000000
--- a/vim/snippets/css/border/style.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
diff --git a/vim/snippets/css/border/width.snippet b/vim/snippets/css/border/width.snippet
deleted file mode 100755
index 7c5fba0..0000000
--- a/vim/snippets/css/border/width.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-width: ${1:1px};$0
diff --git a/vim/snippets/css/borderb/basic.snippet b/vim/snippets/css/borderb/basic.snippet
deleted file mode 100755
index e0b7c21..0000000
--- a/vim/snippets/css/borderb/basic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-bottom: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/borderb/color.snippet b/vim/snippets/css/borderb/color.snippet
deleted file mode 100755
index d980e49..0000000
--- a/vim/snippets/css/borderb/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-bottom-color: #${1:999};$0
diff --git a/vim/snippets/css/borderb/style.snippet b/vim/snippets/css/borderb/style.snippet
deleted file mode 100755
index 24617c6..0000000
--- a/vim/snippets/css/borderb/style.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-bottom-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
diff --git a/vim/snippets/css/borderb/width.snippet b/vim/snippets/css/borderb/width.snippet
deleted file mode 100755
index 2689cd5..0000000
--- a/vim/snippets/css/borderb/width.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-bottom-width: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/borderl/basic.snippet b/vim/snippets/css/borderl/basic.snippet
deleted file mode 100755
index dd4dd2a..0000000
--- a/vim/snippets/css/borderl/basic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-left: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/borderl/color.snippet b/vim/snippets/css/borderl/color.snippet
deleted file mode 100755
index 68afecb..0000000
--- a/vim/snippets/css/borderl/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-left-color: #${1:999};$0
diff --git a/vim/snippets/css/borderl/style.snippet b/vim/snippets/css/borderl/style.snippet
deleted file mode 100755
index 074cbfa..0000000
--- a/vim/snippets/css/borderl/style.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-left-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
diff --git a/vim/snippets/css/borderl/width.snippet b/vim/snippets/css/borderl/width.snippet
deleted file mode 100755
index 1e2acef..0000000
--- a/vim/snippets/css/borderl/width.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-left-width: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/borderr/basic.snippet b/vim/snippets/css/borderr/basic.snippet
deleted file mode 100755
index a0a3e4b..0000000
--- a/vim/snippets/css/borderr/basic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-right: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/borderr/color.snippet b/vim/snippets/css/borderr/color.snippet
deleted file mode 100755
index 320accc..0000000
--- a/vim/snippets/css/borderr/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-right-color: #${1:999};$0
diff --git a/vim/snippets/css/borderr/style.snippet b/vim/snippets/css/borderr/style.snippet
deleted file mode 100755
index 8b03f66..0000000
--- a/vim/snippets/css/borderr/style.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-right-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
diff --git a/vim/snippets/css/borderr/width.snippet b/vim/snippets/css/borderr/width.snippet
deleted file mode 100755
index 9df0426..0000000
--- a/vim/snippets/css/borderr/width.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-right-width: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/bordert/basic.snippet b/vim/snippets/css/bordert/basic.snippet
deleted file mode 100755
index e233448..0000000
--- a/vim/snippets/css/bordert/basic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-top: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/bordert/color.snippet b/vim/snippets/css/bordert/color.snippet
deleted file mode 100755
index 1a79fb4..0000000
--- a/vim/snippets/css/bordert/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-top-color: #${1:999};$0
diff --git a/vim/snippets/css/bordert/style.snippet b/vim/snippets/css/bordert/style.snippet
deleted file mode 100755
index d6ae011..0000000
--- a/vim/snippets/css/bordert/style.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-top-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
diff --git a/vim/snippets/css/bordert/width.snippet b/vim/snippets/css/bordert/width.snippet
deleted file mode 100755
index 5faaef1..0000000
--- a/vim/snippets/css/bordert/width.snippet
+++ /dev/null
@@ -1 +0,0 @@
-border-top-width: ${1:1}px ${2:solid} #${3:999};$0
diff --git a/vim/snippets/css/cl.snippet b/vim/snippets/css/cl.snippet
deleted file mode 100755
index a13d120..0000000
--- a/vim/snippets/css/cl.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-.${1:class} {
-  ${2:color: pink;}
-}
diff --git a/vim/snippets/css/clear.snippet b/vim/snippets/css/clear.snippet
deleted file mode 100755
index 16b3930..0000000
--- a/vim/snippets/css/clear.snippet
+++ /dev/null
@@ -1 +0,0 @@
-clear: ${1:left/right/both/none};$0
diff --git a/vim/snippets/css/color.snippet b/vim/snippets/css/color.snippet
deleted file mode 100755
index 3d2728a..0000000
--- a/vim/snippets/css/color.snippet
+++ /dev/null
@@ -1 +0,0 @@
-color: #${1:DDD};$0
diff --git a/vim/snippets/css/colorn.snippet b/vim/snippets/css/colorn.snippet
deleted file mode 100755
index 52da6c9..0000000
--- a/vim/snippets/css/colorn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-color: ${1:red};$0
diff --git a/vim/snippets/css/colorr.snippet b/vim/snippets/css/colorr.snippet
deleted file mode 100755
index 4204aad..0000000
--- a/vim/snippets/css/colorr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-color: rgb(${1:255},${2:255},${3:255});$0
diff --git a/vim/snippets/css/cursor.snippet b/vim/snippets/css/cursor.snippet
deleted file mode 100755
index c2e45c7..0000000
--- a/vim/snippets/css/cursor.snippet
+++ /dev/null
@@ -1 +0,0 @@
-cursor: ${1:default/auto/crosshair/pointer/move/*-resize/text/wait/help};$0
diff --git a/vim/snippets/css/cursuru.snippet b/vim/snippets/css/cursuru.snippet
deleted file mode 100755
index 35b1ef2..0000000
--- a/vim/snippets/css/cursuru.snippet
+++ /dev/null
@@ -1 +0,0 @@
-cursor: url($1);$0
diff --git a/vim/snippets/css/direction.snippet b/vim/snippets/css/direction.snippet
deleted file mode 100755
index e0a495a..0000000
--- a/vim/snippets/css/direction.snippet
+++ /dev/null
@@ -1 +0,0 @@
-direction: ${1:ltr|rtl};$0
diff --git a/vim/snippets/css/display/block.snippet b/vim/snippets/css/display/block.snippet
deleted file mode 100755
index d35d1c2..0000000
--- a/vim/snippets/css/display/block.snippet
+++ /dev/null
@@ -1 +0,0 @@
-display: block;$0
diff --git a/vim/snippets/css/display/common.snippet b/vim/snippets/css/display/common.snippet
deleted file mode 100755
index 38100a8..0000000
--- a/vim/snippets/css/display/common.snippet
+++ /dev/null
@@ -1 +0,0 @@
-display: ${1:none/inline/block/list-item/run-in/compact/marker};$0
diff --git a/vim/snippets/css/display/inline.snippet b/vim/snippets/css/display/inline.snippet
deleted file mode 100755
index 1969678..0000000
--- a/vim/snippets/css/display/inline.snippet
+++ /dev/null
@@ -1 +0,0 @@
-display: inline;$0
diff --git a/vim/snippets/css/display/table.snippet b/vim/snippets/css/display/table.snippet
deleted file mode 100755
index eeb4da0..0000000
--- a/vim/snippets/css/display/table.snippet
+++ /dev/null
@@ -1 +0,0 @@
-display: ${1:table/inline-table/table-row-group/table-header-group/table-footer-group/table-row/table-column-group/table-column/table-cell/table-caption};$0
diff --git a/vim/snippets/css/float.snippet b/vim/snippets/css/float.snippet
deleted file mode 100755
index b43a23c..0000000
--- a/vim/snippets/css/float.snippet
+++ /dev/null
@@ -1 +0,0 @@
-float: ${1:left/right/none};$0
diff --git a/vim/snippets/css/font/all.snippet b/vim/snippets/css/font/all.snippet
deleted file mode 100755
index 30900a1..0000000
--- a/vim/snippets/css/font/all.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font: ${1:normal/italic/oblique} ${2:normal/small-caps} ${3:normal/bold} ${4:1em/1.5em} ${5:Arial}, ${6:sans-}serif;$0
diff --git a/vim/snippets/css/font/family.snippet b/vim/snippets/css/font/family.snippet
deleted file mode 100755
index b48c3f6..0000000
--- a/vim/snippets/css/font/family.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font-family: ${1:Arial, "MS Trebuchet"}, ${2:sans-}serif;$0
diff --git a/vim/snippets/css/font/size.snippet b/vim/snippets/css/font/size.snippet
deleted file mode 100755
index 4a43b04..0000000
--- a/vim/snippets/css/font/size.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font-size: ${1:100%};$0
diff --git a/vim/snippets/css/font/size_font.snippet b/vim/snippets/css/font/size_font.snippet
deleted file mode 100755
index 185b615..0000000
--- a/vim/snippets/css/font/size_font.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font: ${1:75%} ${2:"Lucida Grande", "Trebuchet MS", Verdana,} ${3:sans-}serif;$0
diff --git a/vim/snippets/css/font/style.snippet b/vim/snippets/css/font/style.snippet
deleted file mode 100755
index 94b6e1d..0000000
--- a/vim/snippets/css/font/style.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font-style: ${1:normal/italic/oblique};$0
diff --git a/vim/snippets/css/font/variant.snippet b/vim/snippets/css/font/variant.snippet
deleted file mode 100755
index f0aa67f..0000000
--- a/vim/snippets/css/font/variant.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font-variant: ${1:normal/small-caps};$0
diff --git a/vim/snippets/css/font/weight.snippet b/vim/snippets/css/font/weight.snippet
deleted file mode 100755
index c355c88..0000000
--- a/vim/snippets/css/font/weight.snippet
+++ /dev/null
@@ -1 +0,0 @@
-font-weight: ${1:normal/bold};$0
diff --git a/vim/snippets/css/i.snippet b/vim/snippets/css/i.snippet
deleted file mode 100755
index 5ca99ef..0000000
--- a/vim/snippets/css/i.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:!important}
diff --git a/vim/snippets/css/letter.snippet b/vim/snippets/css/letter.snippet
deleted file mode 100755
index 53f64a1..0000000
--- a/vim/snippets/css/letter.snippet
+++ /dev/null
@@ -1 +0,0 @@
-letter-spacing: ${1}${2:em/px};$0
diff --git a/vim/snippets/css/letterem.snippet b/vim/snippets/css/letterem.snippet
deleted file mode 100755
index 4d81aa3..0000000
--- a/vim/snippets/css/letterem.snippet
+++ /dev/null
@@ -1 +0,0 @@
-letter-spacing: $1em;$0
diff --git a/vim/snippets/css/letterpx.snippet b/vim/snippets/css/letterpx.snippet
deleted file mode 100755
index d6d3fee..0000000
--- a/vim/snippets/css/letterpx.snippet
+++ /dev/null
@@ -1 +0,0 @@
-letter-spacing: $1px;$0
diff --git a/vim/snippets/css/list-style/image.snippet b/vim/snippets/css/list-style/image.snippet
deleted file mode 100755
index f6f0bc8..0000000
--- a/vim/snippets/css/list-style/image.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-image: url($1);$0
diff --git a/vim/snippets/css/list-style/position.snippet b/vim/snippets/css/list-style/position.snippet
deleted file mode 100755
index 904f45d..0000000
--- a/vim/snippets/css/list-style/position.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-position: ${1:inside/outside};$0
diff --git a/vim/snippets/css/list-style/type_asian.snippet b/vim/snippets/css/list-style/type_asian.snippet
deleted file mode 100755
index 220cf07..0000000
--- a/vim/snippets/css/list-style/type_asian.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-type: ${1:cjk-ideographic/hiragana/katakana/hiragana-iroha/katakana-iroha};$0
diff --git a/vim/snippets/css/list-style/type_marker.snippet b/vim/snippets/css/list-style/type_marker.snippet
deleted file mode 100755
index 5c9350a..0000000
--- a/vim/snippets/css/list-style/type_marker.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-type: ${1:none/disc/circle/square};$0
diff --git a/vim/snippets/css/list-style/type_numeric.snippet b/vim/snippets/css/list-style/type_numeric.snippet
deleted file mode 100755
index 05efdce..0000000
--- a/vim/snippets/css/list-style/type_numeric.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-type: ${1:decimal/decimal-leading-zero/zero};$0
diff --git a/vim/snippets/css/list-style/type_other.snippet b/vim/snippets/css/list-style/type_other.snippet
deleted file mode 100755
index 0e987a9..0000000
--- a/vim/snippets/css/list-style/type_other.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-type: ${1:hebrew/armenian/georgian};$0
diff --git a/vim/snippets/css/list-style/type_position_image.snippet b/vim/snippets/css/list-style/type_position_image.snippet
deleted file mode 100755
index 8d7397b..0000000
--- a/vim/snippets/css/list-style/type_position_image.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style: ${1:none/disc/circle/square/decimal/zero} ${2:inside/outside} url($3);$0
diff --git a/vim/snippets/css/list-style/type_roman_alpha_greek.snippet b/vim/snippets/css/list-style/type_roman_alpha_greek.snippet
deleted file mode 100755
index 7a6a762..0000000
--- a/vim/snippets/css/list-style/type_roman_alpha_greek.snippet
+++ /dev/null
@@ -1 +0,0 @@
-list-style-type: ${1:lower-roman/upper-roman/lower-alpha/upper-alpha/lower-greek/lower-latin/upper-latin};$0
diff --git a/vim/snippets/css/margin.snippet b/vim/snippets/css/margin.snippet
deleted file mode 100755
index 06d3fa9..0000000
--- a/vim/snippets/css/margin.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
diff --git a/vim/snippets/css/marginb.snippet b/vim/snippets/css/marginb.snippet
deleted file mode 100755
index abb7f41..0000000
--- a/vim/snippets/css/marginb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-bottom: ${1:20px};$0
diff --git a/vim/snippets/css/marginl.snippet b/vim/snippets/css/marginl.snippet
deleted file mode 100755
index 5ecc61b..0000000
--- a/vim/snippets/css/marginl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-left: ${1:20px};$0
diff --git a/vim/snippets/css/margino/T_R_B_L.snippet b/vim/snippets/css/margino/T_R_B_L.snippet
deleted file mode 100755
index 06d3fa9..0000000
--- a/vim/snippets/css/margino/T_R_B_L.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
diff --git a/vim/snippets/css/margino/V_H.snippet b/vim/snippets/css/margino/V_H.snippet
deleted file mode 100755
index e342797..0000000
--- a/vim/snippets/css/margino/V_H.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin: ${1:20px} ${2:0px};$0
diff --git a/vim/snippets/css/margino/all.snippet b/vim/snippets/css/margino/all.snippet
deleted file mode 100755
index 1be5f95..0000000
--- a/vim/snippets/css/margino/all.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin: ${1:20px};$0
diff --git a/vim/snippets/css/margino/bottom.snippet b/vim/snippets/css/margino/bottom.snippet
deleted file mode 100755
index abb7f41..0000000
--- a/vim/snippets/css/margino/bottom.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-bottom: ${1:20px};$0
diff --git a/vim/snippets/css/margino/left.snippet b/vim/snippets/css/margino/left.snippet
deleted file mode 100755
index 5ecc61b..0000000
--- a/vim/snippets/css/margino/left.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-left: ${1:20px};$0
diff --git a/vim/snippets/css/margino/right.snippet b/vim/snippets/css/margino/right.snippet
deleted file mode 100755
index d600636..0000000
--- a/vim/snippets/css/margino/right.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-right: ${1:20px};$0
diff --git a/vim/snippets/css/margino/top.snippet b/vim/snippets/css/margino/top.snippet
deleted file mode 100755
index c2bc40f..0000000
--- a/vim/snippets/css/margino/top.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-top: ${1:20px};$0
diff --git a/vim/snippets/css/marginr.snippet b/vim/snippets/css/marginr.snippet
deleted file mode 100755
index d600636..0000000
--- a/vim/snippets/css/marginr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-right: ${1:20px};$0
diff --git a/vim/snippets/css/margint.snippet b/vim/snippets/css/margint.snippet
deleted file mode 100755
index c2bc40f..0000000
--- a/vim/snippets/css/margint.snippet
+++ /dev/null
@@ -1 +0,0 @@
-margin-top: ${1:20px};$0
diff --git a/vim/snippets/css/marker/offset_auto.snippet b/vim/snippets/css/marker/offset_auto.snippet
deleted file mode 100755
index f4c107a..0000000
--- a/vim/snippets/css/marker/offset_auto.snippet
+++ /dev/null
@@ -1 +0,0 @@
-marker-offset: auto;$0
diff --git a/vim/snippets/css/marker/offset_length.snippet b/vim/snippets/css/marker/offset_length.snippet
deleted file mode 100755
index 864e750..0000000
--- a/vim/snippets/css/marker/offset_length.snippet
+++ /dev/null
@@ -1 +0,0 @@
-marker-offset: ${1:10px};$0
diff --git a/vim/snippets/css/opacity.snippet b/vim/snippets/css/opacity.snippet
deleted file mode 100755
index de7d62b..0000000
--- a/vim/snippets/css/opacity.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-opacity: ${1:0.5};${100:
-}-moz-opacity: ${1:0.5};${100:
-}filter:alpha(opacity=${2:${1/(1?)0?\.(.*)/$1$2/}${1/^\d*\.\d\d+$|^\d*$|(^\d\.\d$)/(?1:0)/}});$0
diff --git a/vim/snippets/css/overflow.snippet b/vim/snippets/css/overflow.snippet
deleted file mode 100755
index 3caac03..0000000
--- a/vim/snippets/css/overflow.snippet
+++ /dev/null
@@ -1 +0,0 @@
-overflow: ${1:visible/hidden/scroll/auto};$0
diff --git a/vim/snippets/css/padding.snippet b/vim/snippets/css/padding.snippet
deleted file mode 100755
index db2a3ef..0000000
--- a/vim/snippets/css/padding.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
diff --git a/vim/snippets/css/paddingb.snippet b/vim/snippets/css/paddingb.snippet
deleted file mode 100755
index 66ad6be..0000000
--- a/vim/snippets/css/paddingb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-bottom: ${1:20px};$0
diff --git a/vim/snippets/css/paddingl.snippet b/vim/snippets/css/paddingl.snippet
deleted file mode 100755
index 0853f49..0000000
--- a/vim/snippets/css/paddingl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-left: ${1:20px};$0
diff --git a/vim/snippets/css/paddingo/T_R_B_L.snippet b/vim/snippets/css/paddingo/T_R_B_L.snippet
deleted file mode 100755
index db2a3ef..0000000
--- a/vim/snippets/css/paddingo/T_R_B_L.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
diff --git a/vim/snippets/css/paddingo/V_H.snippet b/vim/snippets/css/paddingo/V_H.snippet
deleted file mode 100755
index 0b92d8e..0000000
--- a/vim/snippets/css/paddingo/V_H.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding: ${1:20px} ${2:0px};$0
diff --git a/vim/snippets/css/paddingo/all.snippet b/vim/snippets/css/paddingo/all.snippet
deleted file mode 100755
index 6d38bf7..0000000
--- a/vim/snippets/css/paddingo/all.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding: ${1:20px};$0
diff --git a/vim/snippets/css/paddingo/bottom.snippet b/vim/snippets/css/paddingo/bottom.snippet
deleted file mode 100755
index 66ad6be..0000000
--- a/vim/snippets/css/paddingo/bottom.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-bottom: ${1:20px};$0
diff --git a/vim/snippets/css/paddingo/left.snippet b/vim/snippets/css/paddingo/left.snippet
deleted file mode 100755
index 0853f49..0000000
--- a/vim/snippets/css/paddingo/left.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-left: ${1:20px};$0
diff --git a/vim/snippets/css/paddingo/right.snippet b/vim/snippets/css/paddingo/right.snippet
deleted file mode 100755
index 91a4c80..0000000
--- a/vim/snippets/css/paddingo/right.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-right: ${1:20px};$0
diff --git a/vim/snippets/css/paddingo/top.snippet b/vim/snippets/css/paddingo/top.snippet
deleted file mode 100755
index 9ba6335..0000000
--- a/vim/snippets/css/paddingo/top.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-top: ${1:20px};$0
diff --git a/vim/snippets/css/paddingr.snippet b/vim/snippets/css/paddingr.snippet
deleted file mode 100755
index 91a4c80..0000000
--- a/vim/snippets/css/paddingr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-right: ${1:20px};$0
diff --git a/vim/snippets/css/paddingt.snippet b/vim/snippets/css/paddingt.snippet
deleted file mode 100755
index 9ba6335..0000000
--- a/vim/snippets/css/paddingt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-padding-top: ${1:20px};$0
diff --git a/vim/snippets/css/position.snippet b/vim/snippets/css/position.snippet
deleted file mode 100755
index 2643aae..0000000
--- a/vim/snippets/css/position.snippet
+++ /dev/null
@@ -1 +0,0 @@
-position: ${1:static/relative/absolute/fixed};$0
diff --git a/vim/snippets/css/scrollbar.snippet b/vim/snippets/css/scrollbar.snippet
deleted file mode 100755
index f017249..0000000
--- a/vim/snippets/css/scrollbar.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-scrollbar-base-color:       ${1:#CCCCCC};${2:
-scrollbar-arrow-color:      ${3:#000000};
-scrollbar-track-color:      ${4:#999999};
-scrollbar-3dlight-color:    ${5:#EEEEEE};
-scrollbar-highlight-color:  ${6:#FFFFFF};
-scrollbar-face-color:       ${7:#CCCCCC};
-scrollbar-shadow-color:     ${9:#999999};
-scrollbar-darkshadow-color: ${8:#666666};}
diff --git a/vim/snippets/css/tag.snippet b/vim/snippets/css/tag.snippet
deleted file mode 100755
index 765269c..0000000
--- a/vim/snippets/css/tag.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:tag} {
-  ${2:color: pink;}
-}
diff --git a/vim/snippets/css/text/align.snippet b/vim/snippets/css/text/align.snippet
deleted file mode 100755
index c3a4db3..0000000
--- a/vim/snippets/css/text/align.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-align: ${1:left/right/center/justify};$0
diff --git a/vim/snippets/css/text/decoration.snippet b/vim/snippets/css/text/decoration.snippet
deleted file mode 100755
index 1af58ee..0000000
--- a/vim/snippets/css/text/decoration.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-decoration: ${1:none/underline/overline/line-through/blink};$0
diff --git a/vim/snippets/css/text/indent.snippet b/vim/snippets/css/text/indent.snippet
deleted file mode 100755
index 2dac54b..0000000
--- a/vim/snippets/css/text/indent.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-indent: ${1:10}px;$0
diff --git a/vim/snippets/css/text/shadow_hex.snippet b/vim/snippets/css/text/shadow_hex.snippet
deleted file mode 100755
index f6559e4..0000000
--- a/vim/snippets/css/text/shadow_hex.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-shadow: #${1:DDD} ${2:10px} ${3:10px} ${4:2px};$0
diff --git a/vim/snippets/css/text/shadow_none.snippet b/vim/snippets/css/text/shadow_none.snippet
deleted file mode 100755
index 57a9eb3..0000000
--- a/vim/snippets/css/text/shadow_none.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-shadow: none;$0
diff --git a/vim/snippets/css/text/shadow_rgb.snippet b/vim/snippets/css/text/shadow_rgb.snippet
deleted file mode 100755
index 9b5eacb..0000000
--- a/vim/snippets/css/text/shadow_rgb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-shadow: rgb(${1:255},${2:255},${3:255}) ${4:10px} ${5:10px} ${6:2px};$0
diff --git a/vim/snippets/css/text/transform.snippet b/vim/snippets/css/text/transform.snippet
deleted file mode 100755
index e5cec4c..0000000
--- a/vim/snippets/css/text/transform.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-transform: ${1:capitalize/uppercase/lowercase};$0
diff --git a/vim/snippets/css/text/transform_none.snippet b/vim/snippets/css/text/transform_none.snippet
deleted file mode 100755
index 8618047..0000000
--- a/vim/snippets/css/text/transform_none.snippet
+++ /dev/null
@@ -1 +0,0 @@
-text-transform: none;$0
diff --git a/vim/snippets/css/url.snippet b/vim/snippets/css/url.snippet
deleted file mode 100755
index b45efb2..0000000
--- a/vim/snippets/css/url.snippet
+++ /dev/null
@@ -1 +0,0 @@
-url('${1:../images/}${2}')${3}
diff --git a/vim/snippets/css/vertical.snippet b/vim/snippets/css/vertical.snippet
deleted file mode 100755
index 5f76ac1..0000000
--- a/vim/snippets/css/vertical.snippet
+++ /dev/null
@@ -1 +0,0 @@
-vertical-align: ${1:baseline/sub/super/top/text-top/middle/bottom/text-bottom/length/%};$0
diff --git a/vim/snippets/css/visibility.snippet b/vim/snippets/css/visibility.snippet
deleted file mode 100755
index 5f76ac1..0000000
--- a/vim/snippets/css/visibility.snippet
+++ /dev/null
@@ -1 +0,0 @@
-vertical-align: ${1:baseline/sub/super/top/text-top/middle/bottom/text-bottom/length/%};$0
diff --git a/vim/snippets/css/white.snippet b/vim/snippets/css/white.snippet
deleted file mode 100755
index 066260a..0000000
--- a/vim/snippets/css/white.snippet
+++ /dev/null
@@ -1 +0,0 @@
-white-space: ${1:normal/pre/nowrap};$0
diff --git a/vim/snippets/css/word/spacing_length.snippet b/vim/snippets/css/word/spacing_length.snippet
deleted file mode 100755
index 647ea3e..0000000
--- a/vim/snippets/css/word/spacing_length.snippet
+++ /dev/null
@@ -1 +0,0 @@
-word-spacing: ${1:10px};$0
diff --git a/vim/snippets/css/word/spacing_normal.snippet b/vim/snippets/css/word/spacing_normal.snippet
deleted file mode 100755
index 9461551..0000000
--- a/vim/snippets/css/word/spacing_normal.snippet
+++ /dev/null
@@ -1 +0,0 @@
-word-spacing: normal;$0
diff --git a/vim/snippets/css/z.snippet b/vim/snippets/css/z.snippet
deleted file mode 100755
index fd19d5f..0000000
--- a/vim/snippets/css/z.snippet
+++ /dev/null
@@ -1 +0,0 @@
-z-index: $1;$0
diff --git a/vim/snippets/cucumber/a.snippet b/vim/snippets/cucumber/a.snippet
deleted file mode 100755
index d4415f4..0000000
--- a/vim/snippets/cucumber/a.snippet
+++ /dev/null
@@ -1 +0,0 @@
-And 
diff --git a/vim/snippets/cucumber/aa.snippet b/vim/snippets/cucumber/aa.snippet
deleted file mode 100755
index 1c4ee05..0000000
--- a/vim/snippets/cucumber/aa.snippet
+++ /dev/null
@@ -1 +0,0 @@
-As a ${1}
diff --git a/vim/snippets/cucumber/b.snippet b/vim/snippets/cucumber/b.snippet
deleted file mode 100755
index 67f3302..0000000
--- a/vim/snippets/cucumber/b.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-Background:
-  ${1}
diff --git a/vim/snippets/cucumber/e.snippet b/vim/snippets/cucumber/e.snippet
deleted file mode 100755
index 939fd1c..0000000
--- a/vim/snippets/cucumber/e.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-Examples:
-  
diff --git a/vim/snippets/cucumber/f.snippet b/vim/snippets/cucumber/f.snippet
deleted file mode 100755
index 4e09650..0000000
--- a/vim/snippets/cucumber/f.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-Feature: ${1:name}
-	${2}
diff --git a/vim/snippets/cucumber/feat.snippet b/vim/snippets/cucumber/feat.snippet
deleted file mode 100755
index bcf58fa..0000000
--- a/vim/snippets/cucumber/feat.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-Feature: ${1:[feature name eg. "Manage some thing ..."]}
-	In order to ${2:[goal]}
-	As a ${3:[stakeholder]}
-	I want ${4:[behavior]}
-
diff --git a/vim/snippets/cucumber/feature.snippet b/vim/snippets/cucumber/feature.snippet
deleted file mode 100755
index bcf58fa..0000000
--- a/vim/snippets/cucumber/feature.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-Feature: ${1:[feature name eg. "Manage some thing ..."]}
-	In order to ${2:[goal]}
-	As a ${3:[stakeholder]}
-	I want ${4:[behavior]}
-
diff --git a/vim/snippets/cucumber/g/given.snippet b/vim/snippets/cucumber/g/given.snippet
deleted file mode 100755
index 1849b11..0000000
--- a/vim/snippets/cucumber/g/given.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-Given I am on [page_name]
-
diff --git a/vim/snippets/cucumber/g/given_regexp.snippet b/vim/snippets/cucumber/g/given_regexp.snippet
deleted file mode 100755
index b8d14c0..0000000
--- a/vim/snippets/cucumber/g/given_regexp.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Given /^ (${1:REGEXP})$/ do |${2}|
-	${3}
-end
diff --git a/vim/snippets/cucumber/iwt.snippet b/vim/snippets/cucumber/iwt.snippet
deleted file mode 100755
index cdf54b6..0000000
--- a/vim/snippets/cucumber/iwt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-I want to ${1}
diff --git a/vim/snippets/cucumber/s.snippet b/vim/snippets/cucumber/s.snippet
deleted file mode 100755
index 8e261d3..0000000
--- a/vim/snippets/cucumber/s.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Scenario: 
diff --git a/vim/snippets/cucumber/scen/scenario_with_js.snippet b/vim/snippets/cucumber/scen/scenario_with_js.snippet
deleted file mode 100755
index 3de9f0e..0000000
--- a/vim/snippets/cucumber/scen/scenario_with_js.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-@culerity
-Scenario: ${1:Delete customers}
-	${2:Given the following customers:}
diff --git a/vim/snippets/cucumber/scen/scenario_without_js.snippet b/vim/snippets/cucumber/scen/scenario_without_js.snippet
deleted file mode 100755
index e1dd0aa..0000000
--- a/vim/snippets/cucumber/scen/scenario_without_js.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Scenario: ${1:Register new customers}
-	${2:Given I am on the new customers page
-	And I press "Create"}
diff --git a/vim/snippets/cucumber/so.snippet b/vim/snippets/cucumber/so.snippet
deleted file mode 100755
index e2e3c31..0000000
--- a/vim/snippets/cucumber/so.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Scenario Outline: 
diff --git a/vim/snippets/cucumber/steps b/vim/snippets/cucumber/steps
deleted file mode 100755
index 3836e14..0000000
--- a/vim/snippets/cucumber/steps
+++ /dev/null
@@ -1,23 +0,0 @@
-    When I go to [page_name]
-    When I press "[button]"
-    When I follow "[link]"
-    When I fill in "[field]" with "[value]"
-    When I select "[value]" from "[field]"
-    When I select "[time]" as the date and time
-    When I select "[datetime]" as the "[datetime_label]" date and time
-    When I select "[time]" as the time
-    When I select "[time]" as the "[time_label]" time
-    When I select "[date]" as the date
-    When I select "[date]" as the "[date_label]" date
-    When I check "[field]"
-    When I uncheck "[field]"
-    When I choose "[field]"
-    When I attach the file at "[path]" to "[field]"
-  
-    Then I should see "[text]"
-    Then I should not see "[text]"
-    Then the "[field]" field should contain "[value]"
-    Then the "[field]" field should not contain "[value]"
-    Then the "[label]" checkbox should be checked
-    Then I should be on [page_name]
-
diff --git a/vim/snippets/cucumber/sti.snippet b/vim/snippets/cucumber/sti.snippet
deleted file mode 100755
index 52b71fe..0000000
--- a/vim/snippets/cucumber/sti.snippet
+++ /dev/null
@@ -1 +0,0 @@
-So that I ${1}
diff --git a/vim/snippets/cucumber/t.snippet b/vim/snippets/cucumber/t.snippet
deleted file mode 100755
index eea167a..0000000
--- a/vim/snippets/cucumber/t.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Then 
diff --git a/vim/snippets/cucumber/w.snippet b/vim/snippets/cucumber/w.snippet
deleted file mode 100755
index cba6983..0000000
--- a/vim/snippets/cucumber/w.snippet
+++ /dev/null
@@ -1 +0,0 @@
-When 
diff --git a/vim/snippets/django-html/#.snippet b/vim/snippets/django-html/#.snippet
deleted file mode 100755
index a05348e..0000000
--- a/vim/snippets/django-html/#.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{# ${1:comment} #}
diff --git a/vim/snippets/django-html/%%.snippet b/vim/snippets/django-html/%%.snippet
deleted file mode 100755
index 5eb1b8e..0000000
--- a/vim/snippets/django-html/%%.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% ${1:tag_name} %}
-	${2}
-{% end$1 %}
diff --git a/vim/snippets/django-html/%.snippet b/vim/snippets/django-html/%.snippet
deleted file mode 100755
index 2ecc3e1..0000000
--- a/vim/snippets/django-html/%.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% ${1} %}${2}
diff --git a/vim/snippets/django-html/add.snippet b/vim/snippets/django-html/add.snippet
deleted file mode 100755
index c5845ad..0000000
--- a/vim/snippets/django-html/add.snippet
+++ /dev/null
@@ -1 +0,0 @@
-add:"${1}"
diff --git a/vim/snippets/django-html/autoescape.snippet b/vim/snippets/django-html/autoescape.snippet
deleted file mode 100755
index 0868b9d..0000000
--- a/vim/snippets/django-html/autoescape.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% autoescape ${1:off} %}
-	${2}
-{% endautoescape %}
diff --git a/vim/snippets/django-html/block.snippet b/vim/snippets/django-html/block.snippet
deleted file mode 100755
index f970843..0000000
--- a/vim/snippets/django-html/block.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% block ${1} %}
-	${2}
-{% endblock %}
diff --git a/vim/snippets/django-html/center.snippet b/vim/snippets/django-html/center.snippet
deleted file mode 100755
index e0f7ba1..0000000
--- a/vim/snippets/django-html/center.snippet
+++ /dev/null
@@ -1 +0,0 @@
-center:"${1}"
diff --git a/vim/snippets/django-html/comment.snippet b/vim/snippets/django-html/comment.snippet
deleted file mode 100755
index 4b75338..0000000
--- a/vim/snippets/django-html/comment.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% comment %}
-${1}
-{% endcomment %}
diff --git a/vim/snippets/django-html/cut.snippet b/vim/snippets/django-html/cut.snippet
deleted file mode 100755
index 676eb50..0000000
--- a/vim/snippets/django-html/cut.snippet
+++ /dev/null
@@ -1 +0,0 @@
-cut:"${1}"
diff --git a/vim/snippets/django-html/cycle.snippet b/vim/snippets/django-html/cycle.snippet
deleted file mode 100755
index 526897d..0000000
--- a/vim/snippets/django-html/cycle.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% cycle ${1:val1} ${2:val2} ${3:as } %}
diff --git a/vim/snippets/django-html/date.snippet b/vim/snippets/django-html/date.snippet
deleted file mode 100755
index 27b12af..0000000
--- a/vim/snippets/django-html/date.snippet
+++ /dev/null
@@ -1 +0,0 @@
-date:"${1}"
diff --git a/vim/snippets/django-html/debug.snippet b/vim/snippets/django-html/debug.snippet
deleted file mode 100755
index f2a14ff..0000000
--- a/vim/snippets/django-html/debug.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% debug %}
diff --git a/vim/snippets/django-html/default.snippet b/vim/snippets/django-html/default.snippet
deleted file mode 100755
index cc6575f..0000000
--- a/vim/snippets/django-html/default.snippet
+++ /dev/null
@@ -1 +0,0 @@
-default:"${1}"
diff --git a/vim/snippets/django-html/defaultifnone.snippet b/vim/snippets/django-html/defaultifnone.snippet
deleted file mode 100755
index 48f63bb..0000000
--- a/vim/snippets/django-html/defaultifnone.snippet
+++ /dev/null
@@ -1 +0,0 @@
-default_if_none:"${1}"
diff --git a/vim/snippets/django-html/dictsort.snippet b/vim/snippets/django-html/dictsort.snippet
deleted file mode 100755
index 127cc23..0000000
--- a/vim/snippets/django-html/dictsort.snippet
+++ /dev/null
@@ -1 +0,0 @@
-dictsort:"${1}"
diff --git a/vim/snippets/django-html/dictsortrev.snippet b/vim/snippets/django-html/dictsortrev.snippet
deleted file mode 100755
index f18dc0d..0000000
--- a/vim/snippets/django-html/dictsortrev.snippet
+++ /dev/null
@@ -1 +0,0 @@
-dictsortreversed:"${1}"
diff --git a/vim/snippets/django-html/divisibleby.snippet b/vim/snippets/django-html/divisibleby.snippet
deleted file mode 100755
index 63fa25d..0000000
--- a/vim/snippets/django-html/divisibleby.snippet
+++ /dev/null
@@ -1 +0,0 @@
-divisibleby:"${1}"
diff --git a/vim/snippets/django-html/else.snippet b/vim/snippets/django-html/else.snippet
deleted file mode 100755
index 78b4d0f..0000000
--- a/vim/snippets/django-html/else.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-{% else %}
-${1}
diff --git a/vim/snippets/django-html/empty.snippet b/vim/snippets/django-html/empty.snippet
deleted file mode 100755
index 2d14f52..0000000
--- a/vim/snippets/django-html/empty.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-{% empty %}
-${1}
diff --git a/vim/snippets/django-html/extends.snippet b/vim/snippets/django-html/extends.snippet
deleted file mode 100755
index c078b32..0000000
--- a/vim/snippets/django-html/extends.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "${1:base.html}" %}
diff --git a/vim/snippets/django-html/filter.snippet b/vim/snippets/django-html/filter.snippet
deleted file mode 100755
index 277aea9..0000000
--- a/vim/snippets/django-html/filter.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% filter ${1} %}
-${2}
-{% endfilter %}
diff --git a/vim/snippets/django-html/firstof.snippet b/vim/snippets/django-html/firstof.snippet
deleted file mode 100755
index 9d4bf9a..0000000
--- a/vim/snippets/django-html/firstof.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% firstof ${1} %}
diff --git a/vim/snippets/django-html/floatformat.snippet b/vim/snippets/django-html/floatformat.snippet
deleted file mode 100755
index b1c0719..0000000
--- a/vim/snippets/django-html/floatformat.snippet
+++ /dev/null
@@ -1 +0,0 @@
-floatformat:"${1}"
diff --git a/vim/snippets/django-html/for.snippet b/vim/snippets/django-html/for.snippet
deleted file mode 100755
index da54159..0000000
--- a/vim/snippets/django-html/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for ${1} in ${2} %}
-${3}
-{% endfor %}
diff --git a/vim/snippets/django-html/getdigit.snippet b/vim/snippets/django-html/getdigit.snippet
deleted file mode 100755
index 81e7a3e..0000000
--- a/vim/snippets/django-html/getdigit.snippet
+++ /dev/null
@@ -1 +0,0 @@
-get_digit:"${1}"
diff --git a/vim/snippets/django-html/if.snippet b/vim/snippets/django-html/if.snippet
deleted file mode 100755
index 3cf165a..0000000
--- a/vim/snippets/django-html/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if ${1} %}
-${2}
-{% endif %}
diff --git a/vim/snippets/django-html/ifchanged.snippet b/vim/snippets/django-html/ifchanged.snippet
deleted file mode 100755
index cc5f52c..0000000
--- a/vim/snippets/django-html/ifchanged.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% ifchanged %}
-${1}
-{% endifchanged %}
diff --git a/vim/snippets/django-html/ifequal.snippet b/vim/snippets/django-html/ifequal.snippet
deleted file mode 100755
index 189b2d2..0000000
--- a/vim/snippets/django-html/ifequal.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% ifequal ${1} ${2} %}
-${3}
-{% endifequal %}
diff --git a/vim/snippets/django-html/ifnotequal.snippet b/vim/snippets/django-html/ifnotequal.snippet
deleted file mode 100755
index 9b3d513..0000000
--- a/vim/snippets/django-html/ifnotequal.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% ifnotequal ${1} ${2} %}
-${3}
-{% endifnotequal %}
diff --git a/vim/snippets/django-html/include.snippet b/vim/snippets/django-html/include.snippet
deleted file mode 100755
index bb64157..0000000
--- a/vim/snippets/django-html/include.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% include "${1}" %}
diff --git a/vim/snippets/django-html/join.snippet b/vim/snippets/django-html/join.snippet
deleted file mode 100755
index cef7782..0000000
--- a/vim/snippets/django-html/join.snippet
+++ /dev/null
@@ -1 +0,0 @@
-join:"${1}"
diff --git a/vim/snippets/django-html/lengthis.snippet b/vim/snippets/django-html/lengthis.snippet
deleted file mode 100755
index cbb43fe..0000000
--- a/vim/snippets/django-html/lengthis.snippet
+++ /dev/null
@@ -1 +0,0 @@
-length_is:"${1}"
diff --git a/vim/snippets/django-html/load.snippet b/vim/snippets/django-html/load.snippet
deleted file mode 100755
index 69b90c5..0000000
--- a/vim/snippets/django-html/load.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% load ${1} %}
diff --git a/vim/snippets/django-html/now.snippet b/vim/snippets/django-html/now.snippet
deleted file mode 100755
index 8ab4dfd..0000000
--- a/vim/snippets/django-html/now.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% now "${1:jS F Y H:i}" %}
diff --git a/vim/snippets/django-html/pluralize.snippet b/vim/snippets/django-html/pluralize.snippet
deleted file mode 100755
index 07bcd2f..0000000
--- a/vim/snippets/django-html/pluralize.snippet
+++ /dev/null
@@ -1 +0,0 @@
-pluralize:"${1}"
diff --git a/vim/snippets/django-html/regroup.snippet b/vim/snippets/django-html/regroup.snippet
deleted file mode 100755
index daeb732..0000000
--- a/vim/snippets/django-html/regroup.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% regroup ${1} by ${2} as ${3} %}
diff --git a/vim/snippets/django-html/removetags.snippet b/vim/snippets/django-html/removetags.snippet
deleted file mode 100755
index f5754f2..0000000
--- a/vim/snippets/django-html/removetags.snippet
+++ /dev/null
@@ -1 +0,0 @@
-removetags:"${1}"
diff --git a/vim/snippets/django-html/slice.snippet b/vim/snippets/django-html/slice.snippet
deleted file mode 100755
index 5142304..0000000
--- a/vim/snippets/django-html/slice.snippet
+++ /dev/null
@@ -1 +0,0 @@
-slice:"${1}"
diff --git a/vim/snippets/django-html/spaceless.snippet b/vim/snippets/django-html/spaceless.snippet
deleted file mode 100755
index c0ecc62..0000000
--- a/vim/snippets/django-html/spaceless.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% spaceless %}
-${1}
-{% endspaceless %}
diff --git a/vim/snippets/django-html/ssi.snippet b/vim/snippets/django-html/ssi.snippet
deleted file mode 100755
index 5f0f33a..0000000
--- a/vim/snippets/django-html/ssi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% ssi ${1} %}
diff --git a/vim/snippets/django-html/stringformat.snippet b/vim/snippets/django-html/stringformat.snippet
deleted file mode 100755
index 64caae9..0000000
--- a/vim/snippets/django-html/stringformat.snippet
+++ /dev/null
@@ -1 +0,0 @@
-stringformat:"${1}"
diff --git a/vim/snippets/django-html/templatetag/closeblock.snippet b/vim/snippets/django-html/templatetag/closeblock.snippet
deleted file mode 100755
index 84cd53f..0000000
--- a/vim/snippets/django-html/templatetag/closeblock.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% templatetag closeblock %}
diff --git a/vim/snippets/django-html/templatetag/closevariable.snippet b/vim/snippets/django-html/templatetag/closevariable.snippet
deleted file mode 100755
index 15d875b..0000000
--- a/vim/snippets/django-html/templatetag/closevariable.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% templatetag closevariable %}
diff --git a/vim/snippets/django-html/templatetag/openblock.snippet b/vim/snippets/django-html/templatetag/openblock.snippet
deleted file mode 100755
index b0181c0..0000000
--- a/vim/snippets/django-html/templatetag/openblock.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% templatetag openblock %}
diff --git a/vim/snippets/django-html/templatetag/openvariable.snippet b/vim/snippets/django-html/templatetag/openvariable.snippet
deleted file mode 100755
index e18e9bf..0000000
--- a/vim/snippets/django-html/templatetag/openvariable.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% templatetag openvariable %}
diff --git a/vim/snippets/django-html/time.snippet b/vim/snippets/django-html/time.snippet
deleted file mode 100755
index 2eb8405..0000000
--- a/vim/snippets/django-html/time.snippet
+++ /dev/null
@@ -1 +0,0 @@
-time:"${1}"
diff --git a/vim/snippets/django-html/trans.snippet b/vim/snippets/django-html/trans.snippet
deleted file mode 100755
index f175559..0000000
--- a/vim/snippets/django-html/trans.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% trans "${1:string}" %}
diff --git a/vim/snippets/django-html/truncatewords.snippet b/vim/snippets/django-html/truncatewords.snippet
deleted file mode 100755
index d86a20e..0000000
--- a/vim/snippets/django-html/truncatewords.snippet
+++ /dev/null
@@ -1 +0,0 @@
-truncatewords:${1}
diff --git a/vim/snippets/django-html/truncatewordshtml.snippet b/vim/snippets/django-html/truncatewordshtml.snippet
deleted file mode 100755
index 0e4ece1..0000000
--- a/vim/snippets/django-html/truncatewordshtml.snippet
+++ /dev/null
@@ -1 +0,0 @@
-truncatewords_html:${1}
diff --git a/vim/snippets/django-html/url.snippet b/vim/snippets/django-html/url.snippet
deleted file mode 100755
index 5e99a67..0000000
--- a/vim/snippets/django-html/url.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% url ${1} as ${2} %}
diff --git a/vim/snippets/django-html/urlizetrunc.snippet b/vim/snippets/django-html/urlizetrunc.snippet
deleted file mode 100755
index fcc6aec..0000000
--- a/vim/snippets/django-html/urlizetrunc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-urlizetrunc:${1}
diff --git a/vim/snippets/django-html/widthratio.snippet b/vim/snippets/django-html/widthratio.snippet
deleted file mode 100755
index 5636714..0000000
--- a/vim/snippets/django-html/widthratio.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
diff --git a/vim/snippets/django-html/with.snippet b/vim/snippets/django-html/with.snippet
deleted file mode 100755
index 08cc8f8..0000000
--- a/vim/snippets/django-html/with.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% with ${1} as ${2} %}
diff --git a/vim/snippets/django-html/wordwrap.snippet b/vim/snippets/django-html/wordwrap.snippet
deleted file mode 100755
index 6c39252..0000000
--- a/vim/snippets/django-html/wordwrap.snippet
+++ /dev/null
@@ -1 +0,0 @@
-wordwrap:${1}
diff --git a/vim/snippets/django-html/{.snippet b/vim/snippets/django-html/{.snippet
deleted file mode 100755
index 58654b9..0000000
--- a/vim/snippets/django-html/{.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{{ ${1} }}${2}
diff --git a/vim/snippets/django/auto.snippet b/vim/snippets/django/auto.snippet
deleted file mode 100755
index 728c110..0000000
--- a/vim/snippets/django/auto.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.AutoField()
diff --git a/vim/snippets/django/bool.snippet b/vim/snippets/django/bool.snippet
deleted file mode 100755
index 1f564e8..0000000
--- a/vim/snippets/django/bool.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.BooleanField(${2:default=True})
diff --git a/vim/snippets/django/char.snippet b/vim/snippets/django/char.snippet
deleted file mode 100755
index f5ccd00..0000000
--- a/vim/snippets/django/char.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.CharField(max_length=${2}${3:, blank=True})
diff --git a/vim/snippets/django/comma.snippet b/vim/snippets/django/comma.snippet
deleted file mode 100755
index 9eb14a1..0000000
--- a/vim/snippets/django/comma.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.CommaSeparatedIntegerField(max_length=${2}${3:, blank=True})
diff --git a/vim/snippets/django/date.snippet b/vim/snippets/django/date.snippet
deleted file mode 100755
index c201aa8..0000000
--- a/vim/snippets/django/date.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.DateField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
diff --git a/vim/snippets/django/datetime.snippet b/vim/snippets/django/datetime.snippet
deleted file mode 100755
index 5da4538..0000000
--- a/vim/snippets/django/datetime.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.DateTimeField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
diff --git a/vim/snippets/django/decimal.snippet b/vim/snippets/django/decimal.snippet
deleted file mode 100755
index f790cf3..0000000
--- a/vim/snippets/django/decimal.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.DecimalField(max_digits=${2}, decimal_places=${3})
diff --git a/vim/snippets/django/email.snippet b/vim/snippets/django/email.snippet
deleted file mode 100755
index ce5f86a..0000000
--- a/vim/snippets/django/email.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.EmailField(max_length=${2:75}${3:, blank=True})
diff --git a/vim/snippets/django/file.snippet b/vim/snippets/django/file.snippet
deleted file mode 100755
index 253f40b..0000000
--- a/vim/snippets/django/file.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.FileField(upload_to=${2:path/for/upload}${3:, max_length=100})
diff --git a/vim/snippets/django/filepath.snippet b/vim/snippets/django/filepath.snippet
deleted file mode 100755
index d284973..0000000
--- a/vim/snippets/django/filepath.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.FilePathField(path=${2:"/abs/path/to/dir"}${3:, max_length=100}${4:, match="*.ext"}${5:, recursive=True}${6:, blank=True, })
diff --git a/vim/snippets/django/fk.snippet b/vim/snippets/django/fk.snippet
deleted file mode 100755
index 0c455bb..0000000
--- a/vim/snippets/django/fk.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.ForeignKey(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, to_field=''})
diff --git a/vim/snippets/django/float.snippet b/vim/snippets/django/float.snippet
deleted file mode 100755
index f92a940..0000000
--- a/vim/snippets/django/float.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.FloatField()
diff --git a/vim/snippets/django/form.snippet b/vim/snippets/django/form.snippet
deleted file mode 100755
index 88171ee..0000000
--- a/vim/snippets/django/form.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:FormName}(forms.Form):
-	"""${2:docstring}"""
-	${3}
diff --git a/vim/snippets/django/image.snippet b/vim/snippets/django/image.snippet
deleted file mode 100755
index 9e8c265..0000000
--- a/vim/snippets/django/image.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.ImageField(upload_to=${2:path/for/upload}${3:, height_field=height, width_field=width}${4:, max_length=100})
diff --git a/vim/snippets/django/int.snippet b/vim/snippets/django/int.snippet
deleted file mode 100755
index 866ed9b..0000000
--- a/vim/snippets/django/int.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.IntegerField()
diff --git a/vim/snippets/django/ip.snippet b/vim/snippets/django/ip.snippet
deleted file mode 100755
index c919e38..0000000
--- a/vim/snippets/django/ip.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.IPAddressField()
diff --git a/vim/snippets/django/manytomany.snippet b/vim/snippets/django/manytomany.snippet
deleted file mode 100755
index 11541ab..0000000
--- a/vim/snippets/django/manytomany.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.ManyToManyField(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, symmetrical=False}${6:, through=''}${7:, db_table=''})
diff --git a/vim/snippets/django/model.snippet b/vim/snippets/django/model.snippet
deleted file mode 100755
index 529a57b..0000000
--- a/vim/snippets/django/model.snippet
+++ /dev/null
@@ -1,16 +0,0 @@
-class ${1:ModelName}(models.Model):
-	"""${2:docstring}"""
-	${3}
-	
-	class Meta:
-		${4}
-	
-	def __unicode__(self):
-		return ${5}
-	
-	def save(self, force_insert=False, force_update=False):
-		${6}
-	
-	@models.permalink
-	def get_absolute_url(self):
-		return ('${7:view_or_url_name}' ${8})
diff --git a/vim/snippets/django/modeladmin.snippet b/vim/snippets/django/modeladmin.snippet
deleted file mode 100755
index 7aa0969..0000000
--- a/vim/snippets/django/modeladmin.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-class ${1:ModelName}Admin(admin.ModelAdmin):
-	${2}
-
-admin.site.register($1, $1Admin)
diff --git a/vim/snippets/django/nullbool.snippet b/vim/snippets/django/nullbool.snippet
deleted file mode 100755
index 66e861c..0000000
--- a/vim/snippets/django/nullbool.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.NullBooleanField()
diff --git a/vim/snippets/django/onetoone.snippet b/vim/snippets/django/onetoone.snippet
deleted file mode 100755
index efe118a..0000000
--- a/vim/snippets/django/onetoone.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.OneToOneField(${2:OtherModel}${3:, parent_link=True}${4:, related_name=''}${5:, limit_choices_to=}${6:, to_field=''})
diff --git a/vim/snippets/django/posint.snippet b/vim/snippets/django/posint.snippet
deleted file mode 100755
index d929957..0000000
--- a/vim/snippets/django/posint.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.PositiveIntegerField()
diff --git a/vim/snippets/django/possmallint.snippet b/vim/snippets/django/possmallint.snippet
deleted file mode 100755
index 0e2c317..0000000
--- a/vim/snippets/django/possmallint.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.PositiveSmallIntegerField()
diff --git a/vim/snippets/django/rendertores.snippet b/vim/snippets/django/rendertores.snippet
deleted file mode 100755
index b18e6bd..0000000
--- a/vim/snippets/django/rendertores.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-return render_to_response('${1:template.html}', {
-		${2}
-	}${3:, context_instance=RequestContext(request)}
-)
diff --git a/vim/snippets/django/sendmail.snippet b/vim/snippets/django/sendmail.snippet
deleted file mode 100755
index e6cfcf0..0000000
--- a/vim/snippets/django/sendmail.snippet
+++ /dev/null
@@ -1 +0,0 @@
-mail.send_mail("${1:Subject}", "${2:Message}", "${3:from@example.com}", ${4:["to@example.com"]}${5:, fail_silently=True})
diff --git a/vim/snippets/django/slug.snippet b/vim/snippets/django/slug.snippet
deleted file mode 100755
index 13cc8b2..0000000
--- a/vim/snippets/django/slug.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.SlugField(max_length=${2:50}${3:, blank=True})
diff --git a/vim/snippets/django/smallint.snippet b/vim/snippets/django/smallint.snippet
deleted file mode 100755
index 80151ec..0000000
--- a/vim/snippets/django/smallint.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.SmallIntegerField()
diff --git a/vim/snippets/django/stackedinline.snippet b/vim/snippets/django/stackedinline.snippet
deleted file mode 100755
index bac9209..0000000
--- a/vim/snippets/django/stackedinline.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-class ${1:ModelName}Inline(admin.StackedInline):
-	model = $1
diff --git a/vim/snippets/django/tabularinline.snippet b/vim/snippets/django/tabularinline.snippet
deleted file mode 100755
index 3f35505..0000000
--- a/vim/snippets/django/tabularinline.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-class ${1:ModelName}Inline(admin.TabularInline):
-	model = $1
diff --git a/vim/snippets/django/text.snippet b/vim/snippets/django/text.snippet
deleted file mode 100755
index f037166..0000000
--- a/vim/snippets/django/text.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.TextField(${2:blank=True})
diff --git a/vim/snippets/django/time.snippet b/vim/snippets/django/time.snippet
deleted file mode 100755
index cd3ab51..0000000
--- a/vim/snippets/django/time.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.TimeField(${2:auto_now_add=True, auto_now=True}${3:, blank=True, null=True})
diff --git a/vim/snippets/django/url.snippet b/vim/snippets/django/url.snippet
deleted file mode 100755
index 129e469..0000000
--- a/vim/snippets/django/url.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.URLField(${2:verify_exists=False}${3:, max_length=200}${4:, blank=True})
diff --git a/vim/snippets/django/xml.snippet b/vim/snippets/django/xml.snippet
deleted file mode 100755
index 0f45b5a..0000000
--- a/vim/snippets/django/xml.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:FIELDNAME} = models.XMLField(schema_path=${2:None}${3:, blank=True})
diff --git a/vim/snippets/eruby-rails/%-.snippet b/vim/snippets/eruby-rails/%-.snippet
deleted file mode 100755
index f9ecbe2..0000000
--- a/vim/snippets/eruby-rails/%-.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<% ${1} -%>
diff --git a/vim/snippets/eruby-rails/%.snippet b/vim/snippets/eruby-rails/%.snippet
deleted file mode 100755
index 050627f..0000000
--- a/vim/snippets/eruby-rails/%.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<% ${1} %>
diff --git a/vim/snippets/eruby-rails/%=-.snippet b/vim/snippets/eruby-rails/%=-.snippet
deleted file mode 100755
index 65efa55..0000000
--- a/vim/snippets/eruby-rails/%=-.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1} -%>
diff --git a/vim/snippets/eruby-rails/%=.snippet b/vim/snippets/eruby-rails/%=.snippet
deleted file mode 100755
index cf79319..0000000
--- a/vim/snippets/eruby-rails/%=.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1} %>
diff --git a/vim/snippets/eruby-rails/%h.snippet b/vim/snippets/eruby-rails/%h.snippet
deleted file mode 100755
index 51a95e6..0000000
--- a/vim/snippets/eruby-rails/%h.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%=h ${1} %>
diff --git a/vim/snippets/eruby-rails/conf.snippet b/vim/snippets/eruby-rails/conf.snippet
deleted file mode 100755
index 79cc0ac..0000000
--- a/vim/snippets/eruby-rails/conf.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<% content_for :${1:yield_label_in_layout} do %>
-  ${2}
-<% end %>
diff --git a/vim/snippets/eruby-rails/cs.snippet b/vim/snippets/eruby-rails/cs.snippet
deleted file mode 100755
index 8edc396..0000000
--- a/vim/snippets/eruby-rails/cs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= collection_select ${1:object}, ${2:method}, ${3:collection}, ${4:value_method}, ${5:text_method}${6:,options} %>${7}
diff --git a/vim/snippets/eruby-rails/ct.snippet b/vim/snippets/eruby-rails/ct.snippet
deleted file mode 100755
index 733ee5b..0000000
--- a/vim/snippets/eruby-rails/ct.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= content_tag '${1:DIV}', ${2:content}${3:, options} %>
diff --git a/vim/snippets/eruby-rails/e.snippet b/vim/snippets/eruby-rails/e.snippet
deleted file mode 100755
index f9ecbe2..0000000
--- a/vim/snippets/eruby-rails/e.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<% ${1} -%>
diff --git a/vim/snippets/eruby-rails/eend.snippet b/vim/snippets/eruby-rails/eend.snippet
deleted file mode 100755
index 4c79184..0000000
--- a/vim/snippets/eruby-rails/eend.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<% end -%>
diff --git a/vim/snippets/eruby-rails/end.snippet b/vim/snippets/eruby-rails/end.snippet
deleted file mode 100755
index a55806d..0000000
--- a/vim/snippets/eruby-rails/end.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-<% end -%>
-${1}
diff --git a/vim/snippets/eruby-rails/er.snippet b/vim/snippets/eruby-rails/er.snippet
deleted file mode 100755
index cf79319..0000000
--- a/vim/snippets/eruby-rails/er.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1} %>
diff --git a/vim/snippets/eruby-rails/ff.snippet b/vim/snippets/eruby-rails/ff.snippet
deleted file mode 100755
index 1305a46..0000000
--- a/vim/snippets/eruby-rails/ff.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= form_for @${1:model} do |f| %>
-  ${2}
-<% end %>
diff --git a/vim/snippets/eruby-rails/ffcb.snippet b/vim/snippets/eruby-rails/ffcb.snippet
deleted file mode 100755
index 46feff8..0000000
--- a/vim/snippets/eruby-rails/ffcb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.check_box :${2:attribute} %>
diff --git a/vim/snippets/eruby-rails/ffe.snippet b/vim/snippets/eruby-rails/ffe.snippet
deleted file mode 100755
index 19f367f..0000000
--- a/vim/snippets/eruby-rails/ffe.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<%= form_for @${2:model} do |f| %>
-  <%= f.error_messages %>
-  ${3}
-<% end %>
diff --git a/vim/snippets/eruby-rails/ffff.snippet b/vim/snippets/eruby-rails/ffff.snippet
deleted file mode 100755
index 7db85a2..0000000
--- a/vim/snippets/eruby-rails/ffff.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.file_field :${2:attribute} %>
diff --git a/vim/snippets/eruby-rails/ffhf.snippet b/vim/snippets/eruby-rails/ffhf.snippet
deleted file mode 100755
index 81f9dec..0000000
--- a/vim/snippets/eruby-rails/ffhf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.hidden_field :${2:attribute} %>
diff --git a/vim/snippets/eruby-rails/ffl.snippet b/vim/snippets/eruby-rails/ffl.snippet
deleted file mode 100755
index c0bdcee..0000000
--- a/vim/snippets/eruby-rails/ffl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.label :${2:attribute}, '${3:$2}' %>
diff --git a/vim/snippets/eruby-rails/ffpf.snippet b/vim/snippets/eruby-rails/ffpf.snippet
deleted file mode 100755
index 3b579a3..0000000
--- a/vim/snippets/eruby-rails/ffpf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.password_field :${2:attribute} %>
diff --git a/vim/snippets/eruby-rails/ffrb.snippet b/vim/snippets/eruby-rails/ffrb.snippet
deleted file mode 100755
index d63f0a5..0000000
--- a/vim/snippets/eruby-rails/ffrb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.radio_button :${2:attribute}, :${3:tag_value} %>
diff --git a/vim/snippets/eruby-rails/ffs.snippet b/vim/snippets/eruby-rails/ffs.snippet
deleted file mode 100755
index d0851db..0000000
--- a/vim/snippets/eruby-rails/ffs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.submit "${2:submit}" %>
diff --git a/vim/snippets/eruby-rails/ffta.snippet b/vim/snippets/eruby-rails/ffta.snippet
deleted file mode 100755
index 9057483..0000000
--- a/vim/snippets/eruby-rails/ffta.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.text_area :${2:attribute} %>
diff --git a/vim/snippets/eruby-rails/fftf.snippet b/vim/snippets/eruby-rails/fftf.snippet
deleted file mode 100755
index 83d1add..0000000
--- a/vim/snippets/eruby-rails/fftf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1:f}.text_field :${2:attribute} %>
diff --git a/vim/snippets/eruby-rails/fields.snippet b/vim/snippets/eruby-rails/fields.snippet
deleted file mode 100755
index 9522d5c..0000000
--- a/vim/snippets/eruby-rails/fields.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<% fields_for :${1:model}, @$1 do |${2:f}| %>
-  ${3}
-<% end %>
diff --git a/vim/snippets/eruby-rails/for.snippet b/vim/snippets/eruby-rails/for.snippet
deleted file mode 100755
index 7f67a6c..0000000
--- a/vim/snippets/eruby-rails/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<%- for ${2:item} in ${1:list} -%>
-	${3}
-<%- end -%>
diff --git a/vim/snippets/eruby-rails/ft.snippet b/vim/snippets/eruby-rails/ft.snippet
deleted file mode 100755
index d11978c..0000000
--- a/vim/snippets/eruby-rails/ft.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<% form_tag(${1:'url'}) do -%>
-  ${2}
-<% end -%>
diff --git a/vim/snippets/eruby-rails/fta.snippet b/vim/snippets/eruby-rails/fta.snippet
deleted file mode 100755
index afd2e8c..0000000
--- a/vim/snippets/eruby-rails/fta.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<% form_tag(:action => "${1}", {:{$2:id} => "${3}"${4:,}}) do %>
-  ${5}
-<% end %>
diff --git a/vim/snippets/eruby-rails/i18.snippet b/vim/snippets/eruby-rails/i18.snippet
deleted file mode 100755
index 2a30fae..0000000
--- a/vim/snippets/eruby-rails/i18.snippet
+++ /dev/null
@@ -1 +0,0 @@
-I18n.t('${1:type.key}')${2}
diff --git a/vim/snippets/eruby-rails/it.snippet b/vim/snippets/eruby-rails/it.snippet
deleted file mode 100755
index e15196e..0000000
--- a/vim/snippets/eruby-rails/it.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= image_tag "${1}"${2} %>
diff --git a/vim/snippets/eruby-rails/jit.snippet b/vim/snippets/eruby-rails/jit.snippet
deleted file mode 100755
index 851f484..0000000
--- a/vim/snippets/eruby-rails/jit.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= javascript_include_tag :${1:all}, :cache => ${2:true} %>
diff --git a/vim/snippets/eruby-rails/jsit.snippet b/vim/snippets/eruby-rails/jsit.snippet
deleted file mode 100755
index 187e9ab..0000000
--- a/vim/snippets/eruby-rails/jsit.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= javascript_include_tag "${1}" %>
diff --git a/vim/snippets/eruby-rails/jt.snippet b/vim/snippets/eruby-rails/jt.snippet
deleted file mode 100755
index 882aab9..0000000
--- a/vim/snippets/eruby-rails/jt.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-<% javascript_tag do -%>
-	$(function () {
-		${1}
-	});
-<% end -%>
diff --git a/vim/snippets/eruby-rails/lia.snippet b/vim/snippets/eruby-rails/lia.snippet
deleted file mode 100755
index 2732e6e..0000000
--- a/vim/snippets/eruby-rails/lia.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", :action => "${2:index}" %>
diff --git a/vim/snippets/eruby-rails/liai.snippet b/vim/snippets/eruby-rails/liai.snippet
deleted file mode 100755
index eb3094c..0000000
--- a/vim/snippets/eruby-rails/liai.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", :action => "${2:edit}", :id => @${3:item} %>
diff --git a/vim/snippets/eruby-rails/lic.snippet b/vim/snippets/eruby-rails/lic.snippet
deleted file mode 100755
index f8d5b95..0000000
--- a/vim/snippets/eruby-rails/lic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", :controller => "${2:items}" %>
diff --git a/vim/snippets/eruby-rails/lica.snippet b/vim/snippets/eruby-rails/lica.snippet
deleted file mode 100755
index d9aae5f..0000000
--- a/vim/snippets/eruby-rails/lica.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", :controller => "${2:items}", :action => "${3:index}" %>
diff --git a/vim/snippets/eruby-rails/licai.snippet b/vim/snippets/eruby-rails/licai.snippet
deleted file mode 100755
index eae93d9..0000000
--- a/vim/snippets/eruby-rails/licai.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", :controller => "${2:items}", :action => "${3:edit}", :id => <+@<+item+>+> %>
diff --git a/vim/snippets/eruby-rails/lim.snippet b/vim/snippets/eruby-rails/lim.snippet
deleted file mode 100755
index 767f09b..0000000
--- a/vim/snippets/eruby-rails/lim.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to ${1:model}.${2:name}, ${3:$1_path($1)} %>
diff --git a/vim/snippets/eruby-rails/linp.snippet b/vim/snippets/eruby-rails/linp.snippet
deleted file mode 100755
index ae57d92..0000000
--- a/vim/snippets/eruby-rails/linp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", ${2:parent}_${3:child}_path(@$2, @$3) %>
diff --git a/vim/snippets/eruby-rails/linpp.snippet b/vim/snippets/eruby-rails/linpp.snippet
deleted file mode 100755
index e044734..0000000
--- a/vim/snippets/eruby-rails/linpp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", ${2:parent}_${3:child}_path(@$2) %>
diff --git a/vim/snippets/eruby-rails/lip.snippet b/vim/snippets/eruby-rails/lip.snippet
deleted file mode 100755
index 7d92da7..0000000
--- a/vim/snippets/eruby-rails/lip.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", ${2:model}_path(@${3:instance}) %>
diff --git a/vim/snippets/eruby-rails/lipp.snippet b/vim/snippets/eruby-rails/lipp.snippet
deleted file mode 100755
index f88bbea..0000000
--- a/vim/snippets/eruby-rails/lipp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:link text}", ${2:model}s_path %>
diff --git a/vim/snippets/eruby-rails/lt.snippet b/vim/snippets/eruby-rails/lt.snippet
deleted file mode 100755
index b6c9a5b..0000000
--- a/vim/snippets/eruby-rails/lt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to "${1:name}", ${2:dest} %>
diff --git a/vim/snippets/eruby-rails/ltr.snippet b/vim/snippets/eruby-rails/ltr.snippet
deleted file mode 100755
index 96761d6..0000000
--- a/vim/snippets/eruby-rails/ltr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to_remote "${1:name}", ${2:options} %>
diff --git a/vim/snippets/eruby-rails/ofcfs.snippet b/vim/snippets/eruby-rails/ofcfs.snippet
deleted file mode 100755
index d68f692..0000000
--- a/vim/snippets/eruby-rails/ofcfs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}<+, <+[selected_value]+>+> %>
diff --git a/vim/snippets/eruby-rails/rf.snippet b/vim/snippets/eruby-rails/rf.snippet
deleted file mode 100755
index 16067e9..0000000
--- a/vim/snippets/eruby-rails/rf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :file => "${1:file}"${2} %>
diff --git a/vim/snippets/eruby-rails/rp.snippet b/vim/snippets/eruby-rails/rp.snippet
deleted file mode 100755
index 706a4cb..0000000
--- a/vim/snippets/eruby-rails/rp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => "${1:file}"${2} %>
diff --git a/vim/snippets/eruby-rails/rt.snippet b/vim/snippets/eruby-rails/rt.snippet
deleted file mode 100755
index 75a8f93..0000000
--- a/vim/snippets/eruby-rails/rt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :template => "${1:file}"${2} %>
diff --git a/vim/snippets/eruby-rails/sbtr.snippet b/vim/snippets/eruby-rails/sbtr.snippet
deleted file mode 100755
index 63ea521..0000000
--- a/vim/snippets/eruby-rails/sbtr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= submit_to_remote ${1:name}, ${2:value} %>
diff --git a/vim/snippets/eruby-rails/sff/sff.multi.snippet b/vim/snippets/eruby-rails/sff/sff.multi.snippet
deleted file mode 100755
index 925fbce..0000000
--- a/vim/snippets/eruby-rails/sff/sff.multi.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-<% semantic_form_for @${1:object} do |f| -%>
-	<% f.inputs ${2:do} -%>
-		<%= f.input :${3:name} -%>
-	<% end -%>
-	<%= f.buttons %>
-<% end -%>
diff --git a/vim/snippets/eruby-rails/sff/sff.simple.snippet b/vim/snippets/eruby-rails/sff/sff.simple.snippet
deleted file mode 100755
index 0eedfd6..0000000
--- a/vim/snippets/eruby-rails/sff/sff.simple.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<% semantic_form_for @${1:object} do |f| -%>
-		<%= f.inputs %>${2:}
-		<%= f.buttons %>
-<% end -%>
diff --git a/vim/snippets/eruby-rails/slt.snippet b/vim/snippets/eruby-rails/slt.snippet
deleted file mode 100755
index 3b8ac8c..0000000
--- a/vim/snippets/eruby-rails/slt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= stylesheet_link_tag ${1::all}<+, :cache => <+true+>+> %>
diff --git a/vim/snippets/eruby-rails/sslt.snippet b/vim/snippets/eruby-rails/sslt.snippet
deleted file mode 100755
index 1fd0f68..0000000
--- a/vim/snippets/eruby-rails/sslt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= stylesheet_link_tag "${1}" %>
diff --git a/vim/snippets/eruby-rails/st.snippet b/vim/snippets/eruby-rails/st.snippet
deleted file mode 100755
index e57d458..0000000
--- a/vim/snippets/eruby-rails/st.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= submit_tag "${1:Save changes}"<+, :id => "<+submit+>"+><+, :name => "<+submit+>"+><+, :class => "<+form_name+>"+><+, :disabled => <+false+>+><+, :disable_with => "<+Please wait+>"+> %>
diff --git a/vim/snippets/eruby/e.snippet b/vim/snippets/eruby/e.snippet
deleted file mode 100755
index cf79319..0000000
--- a/vim/snippets/eruby/e.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= ${1} %>
diff --git a/vim/snippets/eruby/else.snippet b/vim/snippets/eruby/else.snippet
deleted file mode 100755
index c9124ed..0000000
--- a/vim/snippets/eruby/else.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%- else -%>
diff --git a/vim/snippets/eruby/end.snippet b/vim/snippets/eruby/end.snippet
deleted file mode 100755
index ef2f0a9..0000000
--- a/vim/snippets/eruby/end.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%- end -%>
diff --git a/vim/snippets/eruby/er.snippet b/vim/snippets/eruby/er.snippet
deleted file mode 100755
index 6ca03fc..0000000
--- a/vim/snippets/eruby/er.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%- ${1} -%>
diff --git a/vim/snippets/eruby/if.snippet b/vim/snippets/eruby/if.snippet
deleted file mode 100755
index 8c9944b..0000000
--- a/vim/snippets/eruby/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<%- if ${1:condition} -%>
-  ${2}
-<%- end -%>
diff --git a/vim/snippets/eruby/ife.snippet b/vim/snippets/eruby/ife.snippet
deleted file mode 100755
index e53079c..0000000
--- a/vim/snippets/eruby/ife.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<%- if ${1} -%>
-  ${2}
-<%- else -%>
-<%- end -%>
diff --git a/vim/snippets/eruby/p.snippet b/vim/snippets/eruby/p.snippet
deleted file mode 100755
index 7bafe49..0000000
--- a/vim/snippets/eruby/p.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-	${1:para}
-</p>
diff --git a/vim/snippets/eruby/unless.snippet b/vim/snippets/eruby/unless.snippet
deleted file mode 100755
index f247253..0000000
--- a/vim/snippets/eruby/unless.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<% unless ${1} %>
-  ${2}
-<% end %>
diff --git a/vim/snippets/eruby/unlesse.snippet b/vim/snippets/eruby/unlesse.snippet
deleted file mode 100755
index e2182a9..0000000
--- a/vim/snippets/eruby/unlesse.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<% unless ${1} %>
-  ${2}
-<% else %>
-<% end %>
diff --git a/vim/snippets/falcon/class.snippet b/vim/snippets/falcon/class.snippet
deleted file mode 100755
index 08d3783..0000000
--- a/vim/snippets/falcon/class.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:class_name}(${2:class_params})
-	${3:/* members/methods */}
-end
diff --git a/vim/snippets/falcon/elif.snippet b/vim/snippets/falcon/elif.snippet
deleted file mode 100755
index 817091e..0000000
--- a/vim/snippets/falcon/elif.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-elif ${1:condition}
-	${2:/* code */}	        
diff --git a/vim/snippets/falcon/forin.snippet b/vim/snippets/falcon/forin.snippet
deleted file mode 100755
index d3dba49..0000000
--- a/vim/snippets/falcon/forin.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for ${1:element} in ${2:container}
-	${3:/* code */}
-end
diff --git a/vim/snippets/falcon/forto.snippet b/vim/snippets/falcon/forto.snippet
deleted file mode 100755
index 04ada9d..0000000
--- a/vim/snippets/falcon/forto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for ${1:lowerbound} to ${2:upperbound}
-	${3:/* code */}
-end
diff --git a/vim/snippets/falcon/fun.snippet b/vim/snippets/falcon/fun.snippet
deleted file mode 100755
index f138154..0000000
--- a/vim/snippets/falcon/fun.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function ${2:function_name}(${3})	
-	${4:/* code */}
-end	
diff --git a/vim/snippets/falcon/if.snippet b/vim/snippets/falcon/if.snippet
deleted file mode 100755
index 131b8e6..0000000
--- a/vim/snippets/falcon/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if ${1:condition}
-	${2:/* code */}		
-end
diff --git a/vim/snippets/falcon/ife.snippet b/vim/snippets/falcon/ife.snippet
deleted file mode 100755
index 4f3fae9..0000000
--- a/vim/snippets/falcon/ife.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-if ${1:condition}
-	${2:/* code */}		
-else
-	${1}	
-end
diff --git a/vim/snippets/falcon/imp.snippet b/vim/snippets/falcon/imp.snippet
deleted file mode 100755
index 74b2d79..0000000
--- a/vim/snippets/falcon/imp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-import ${1:module}
diff --git a/vim/snippets/falcon/while.snippet b/vim/snippets/falcon/while.snippet
deleted file mode 100755
index 0431a4c..0000000
--- a/vim/snippets/falcon/while.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-while ${1:conidition}
-	${2:/* code */}	
-end
diff --git a/vim/snippets/falcon/while.snippet!.snippet b/vim/snippets/falcon/while.snippet!.snippet
deleted file mode 100755
index e1b3c4b..0000000
--- a/vim/snippets/falcon/while.snippet!.snippet
+++ /dev/null
@@ -1 +0,0 @@
-#!/usr/bin/env falcon
diff --git a/vim/snippets/haml-html/p.snippet b/vim/snippets/haml-html/p.snippet
deleted file mode 100755
index 653eaab..0000000
--- a/vim/snippets/haml-html/p.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-%p#${1:id}.${2:class}
-  ${3}
\ No newline at end of file
diff --git a/vim/snippets/haml/conf.snippet b/vim/snippets/haml/conf.snippet
deleted file mode 100755
index d5d782a..0000000
--- a/vim/snippets/haml/conf.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-- content_for :${1:yield_label_in_layout} do
-  ${2}
-
diff --git a/vim/snippets/haml/cs.snippet b/vim/snippets/haml/cs.snippet
deleted file mode 100755
index 47571f1..0000000
--- a/vim/snippets/haml/cs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= collection_select :${1:object}, :${2:method}, :${3:collection}, :${4:value_method}, :${5:text_method} ${6:, [options]} ${7:, [html_options]}
diff --git a/vim/snippets/haml/ff.snippet b/vim/snippets/haml/ff.snippet
deleted file mode 100755
index f5f8efd..0000000
--- a/vim/snippets/haml/ff.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-= form_for @${1:model} do |f|
-  ${2}
diff --git a/vim/snippets/haml/ffcb.snippet b/vim/snippets/haml/ffcb.snippet
deleted file mode 100755
index 0c76b98..0000000
--- a/vim/snippets/haml/ffcb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.check_box :${2:attribute}
diff --git a/vim/snippets/haml/ffe.snippet b/vim/snippets/haml/ffe.snippet
deleted file mode 100755
index f7a0a5d..0000000
--- a/vim/snippets/haml/ffe.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-= form_for @${1:model} do |f|
-  = f.error_messages
-  ${2}
diff --git a/vim/snippets/haml/ffff.snippet b/vim/snippets/haml/ffff.snippet
deleted file mode 100755
index 5803a16..0000000
--- a/vim/snippets/haml/ffff.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.file_field :${2:attribute}
diff --git a/vim/snippets/haml/ffhf.snippet b/vim/snippets/haml/ffhf.snippet
deleted file mode 100755
index 1442f61..0000000
--- a/vim/snippets/haml/ffhf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.hidden_field :${2:attribute}
diff --git a/vim/snippets/haml/ffl.snippet b/vim/snippets/haml/ffl.snippet
deleted file mode 100755
index 143b949..0000000
--- a/vim/snippets/haml/ffl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.label :${2:attribute}
diff --git a/vim/snippets/haml/ffpf.snippet b/vim/snippets/haml/ffpf.snippet
deleted file mode 100755
index ee402f7..0000000
--- a/vim/snippets/haml/ffpf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.password_field :${2:attribute}
diff --git a/vim/snippets/haml/ffrb.snippet b/vim/snippets/haml/ffrb.snippet
deleted file mode 100755
index 54b2eb9..0000000
--- a/vim/snippets/haml/ffrb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.radio_button :${2:attribute}, :${3:tag_value}
diff --git a/vim/snippets/haml/ffs.snippet b/vim/snippets/haml/ffs.snippet
deleted file mode 100755
index f70ce2e..0000000
--- a/vim/snippets/haml/ffs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.submit "${2:Submit}"
diff --git a/vim/snippets/haml/ffta.snippet b/vim/snippets/haml/ffta.snippet
deleted file mode 100755
index 552abab..0000000
--- a/vim/snippets/haml/ffta.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.text_area :${2:attribute}
diff --git a/vim/snippets/haml/fftf.snippet b/vim/snippets/haml/fftf.snippet
deleted file mode 100755
index 54c852e..0000000
--- a/vim/snippets/haml/fftf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= ${1:f}.text_field :${2:attribute}
diff --git a/vim/snippets/haml/fields.snippet b/vim/snippets/haml/fields.snippet
deleted file mode 100755
index 52e70f3..0000000
--- a/vim/snippets/haml/fields.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-- fields_for :${1:model}, @$1 do |${2:f}|
-  ${3}
diff --git a/vim/snippets/haml/for.snippet b/vim/snippets/haml/for.snippet
deleted file mode 100755
index 1037c39..0000000
--- a/vim/snippets/haml/for.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-- for ${1:item} in ${2:items}
-  ${3}
diff --git a/vim/snippets/haml/ft.snippet b/vim/snippets/haml/ft.snippet
deleted file mode 100755
index 3222326..0000000
--- a/vim/snippets/haml/ft.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-= form_tag(:action => "${1:update}") do
-  ${2}
diff --git a/vim/snippets/haml/if.snippet b/vim/snippets/haml/if.snippet
deleted file mode 100755
index 9462ff5..0000000
--- a/vim/snippets/haml/if.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-- if ${1}
-  ${2}
diff --git a/vim/snippets/haml/ife.snippet b/vim/snippets/haml/ife.snippet
deleted file mode 100755
index 4d605c7..0000000
--- a/vim/snippets/haml/ife.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-- if ${1}
-  ${2}
-- else
diff --git a/vim/snippets/haml/it.snippet b/vim/snippets/haml/it.snippet
deleted file mode 100755
index 41ad078..0000000
--- a/vim/snippets/haml/it.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= image_tag "${1}"
diff --git a/vim/snippets/haml/jit.snippet b/vim/snippets/haml/jit.snippet
deleted file mode 100755
index 1580962..0000000
--- a/vim/snippets/haml/jit.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= javascript_include_tag ${1::all}, :cache => ${2:true}
diff --git a/vim/snippets/haml/jsit.snippet b/vim/snippets/haml/jsit.snippet
deleted file mode 100755
index d5e8f55..0000000
--- a/vim/snippets/haml/jsit.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= javascript_include_tag "${1}"
diff --git a/vim/snippets/haml/lia.snippet b/vim/snippets/haml/lia.snippet
deleted file mode 100755
index a074da2..0000000
--- a/vim/snippets/haml/lia.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", :action => "${2:index}"
diff --git a/vim/snippets/haml/liai.snippet b/vim/snippets/haml/liai.snippet
deleted file mode 100755
index d6bd525..0000000
--- a/vim/snippets/haml/liai.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link_text}", :action => "${2:edit}", :id => ${3:@item}
diff --git a/vim/snippets/haml/lic.snippet b/vim/snippets/haml/lic.snippet
deleted file mode 100755
index dee0b49..0000000
--- a/vim/snippets/haml/lic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", :controller => "${2:items}"
diff --git a/vim/snippets/haml/lica.snippet b/vim/snippets/haml/lica.snippet
deleted file mode 100755
index 2f7ea3a..0000000
--- a/vim/snippets/haml/lica.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", :controller => "${2:items}", :action => "${3:index}"
diff --git a/vim/snippets/haml/licai.snippet b/vim/snippets/haml/licai.snippet
deleted file mode 100755
index 0f3027c..0000000
--- a/vim/snippets/haml/licai.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item}
diff --git a/vim/snippets/haml/lim.snippet b/vim/snippets/haml/lim.snippet
deleted file mode 100755
index 424ff8f..0000000
--- a/vim/snippets/haml/lim.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to ${1:model}.${2:name}, $1_path($1)
diff --git a/vim/snippets/haml/linp.snippet b/vim/snippets/haml/linp.snippet
deleted file mode 100755
index 0405568..0000000
--- a/vim/snippets/haml/linp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", ${2:parent}_${3:child}_path(@$2, @$3)
diff --git a/vim/snippets/haml/linpp.snippet b/vim/snippets/haml/linpp.snippet
deleted file mode 100755
index b755f07..0000000
--- a/vim/snippets/haml/linpp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", ${2:parent}_${3:child}_path(@$2)
diff --git a/vim/snippets/haml/lip.snippet b/vim/snippets/haml/lip.snippet
deleted file mode 100755
index a256fe1..0000000
--- a/vim/snippets/haml/lip.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", ${2:model}_path(${3:@instance})
diff --git a/vim/snippets/haml/lipp.snippet b/vim/snippets/haml/lipp.snippet
deleted file mode 100755
index d2bc765..0000000
--- a/vim/snippets/haml/lipp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1:link text}", ${2:model}s_path
diff --git a/vim/snippets/haml/lt.snippet b/vim/snippets/haml/lt.snippet
deleted file mode 100755
index ad66392..0000000
--- a/vim/snippets/haml/lt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= link_to "${1}", ${2:dest}
diff --git a/vim/snippets/haml/ofcfs.snippet b/vim/snippets/haml/ofcfs.snippet
deleted file mode 100755
index c71ff2b..0000000
--- a/vim/snippets/haml/ofcfs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${4:[selected_value]}
diff --git a/vim/snippets/haml/rf.snippet b/vim/snippets/haml/rf.snippet
deleted file mode 100755
index e5476a0..0000000
--- a/vim/snippets/haml/rf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= render :file => "${1:file}"${2}
diff --git a/vim/snippets/haml/rp.snippet b/vim/snippets/haml/rp.snippet
deleted file mode 100755
index 28e5c18..0000000
--- a/vim/snippets/haml/rp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= render :partial => "${1:file}"${2}
diff --git a/vim/snippets/haml/rt.snippet b/vim/snippets/haml/rt.snippet
deleted file mode 100755
index f7960bd..0000000
--- a/vim/snippets/haml/rt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= render :template => "${1:file}"${2}
diff --git a/vim/snippets/haml/slt.snippet b/vim/snippets/haml/slt.snippet
deleted file mode 100755
index 87e572c..0000000
--- a/vim/snippets/haml/slt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= stylesheet_link_tag ${1::all}, :cache => ${2:true}
diff --git a/vim/snippets/haml/sslt.snippet b/vim/snippets/haml/sslt.snippet
deleted file mode 100755
index 066a170..0000000
--- a/vim/snippets/haml/sslt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= stylesheet_link_tag "${1}"
diff --git a/vim/snippets/haml/st.snippet b/vim/snippets/haml/st.snippet
deleted file mode 100755
index 0f06c61..0000000
--- a/vim/snippets/haml/st.snippet
+++ /dev/null
@@ -1 +0,0 @@
-= submit_tag "${1:Save changes}"
diff --git a/vim/snippets/haml/unless.snippet b/vim/snippets/haml/unless.snippet
deleted file mode 100755
index a788eb9..0000000
--- a/vim/snippets/haml/unless.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-- unless ${1}
-  ${2}
-
diff --git a/vim/snippets/haml/unlesse.snippet b/vim/snippets/haml/unlesse.snippet
deleted file mode 100755
index b8d12d8..0000000
--- a/vim/snippets/haml/unlesse.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
--if ${1}
-  ${2}
--else
-  
diff --git a/vim/snippets/html.snippets b/vim/snippets/html.snippets
deleted file mode 100755
index fe7e2db..0000000
--- a/vim/snippets/html.snippets
+++ /dev/null
@@ -1,6 +0,0 @@
-snippet <!
-<!-- ${1} -->${2}
-snippet <
-<${1:div}${2}>
-	${3}
-</$1>
diff --git a/vim/snippets/html/ah.snippet b/vim/snippets/html/ah.snippet
deleted file mode 100755
index 7aba565..0000000
--- a/vim/snippets/html/ah.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<a href="${1:#}">${2}</a>${3}
diff --git a/vim/snippets/html/base.snippet b/vim/snippets/html/base.snippet
deleted file mode 100755
index 0e273e2..0000000
--- a/vim/snippets/html/base.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<base href="<++>"<+ target="<++>"+>/>
diff --git a/vim/snippets/html/body.snippet b/vim/snippets/html/body.snippet
deleted file mode 100755
index 692403d..0000000
--- a/vim/snippets/html/body.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<body id="${1}">
-	${2}
-</body>
diff --git a/vim/snippets/html/break.snippet b/vim/snippets/html/break.snippet
deleted file mode 100755
index 07ff652..0000000
--- a/vim/snippets/html/break.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<!--break-->
diff --git a/vim/snippets/html/css.snippet b/vim/snippets/html/css.snippet
deleted file mode 100755
index f25d677..0000000
--- a/vim/snippets/html/css.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" charset="utf-8">${4}
diff --git a/vim/snippets/html/div.snippet b/vim/snippets/html/div.snippet
deleted file mode 100755
index 1ee10bf..0000000
--- a/vim/snippets/html/div.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="${1}">
-	${2}
-</div>
diff --git a/vim/snippets/html/doctype.snippet b/vim/snippets/html/doctype.snippet
deleted file mode 100644
index 8d98d40..0000000
--- a/vim/snippets/html/doctype.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">${1}
diff --git a/vim/snippets/html/doctype/HTML 4.01 Strict.snippet b/vim/snippets/html/doctype/HTML 4.01 Strict.snippet
deleted file mode 100755
index 7293f80..0000000
--- a/vim/snippets/html/doctype/HTML 4.01 Strict.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""
-"http://www.w3.org/TR/html4/strict.dtd">
\ No newline at end of file
diff --git a/vim/snippets/html/doctype/HTML 4.01 Transitional.snippet b/vim/snippets/html/doctype/HTML 4.01 Transitional.snippet
deleted file mode 100755
index 2c6623e..0000000
--- a/vim/snippets/html/doctype/HTML 4.01 Transitional.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""
-"http://www.w3.org/TR/html4/loose.dtd">
\ No newline at end of file
diff --git a/vim/snippets/html/doctype/HTML 5.snippet b/vim/snippets/html/doctype/HTML 5.snippet
deleted file mode 100755
index 5fa1cdf..0000000
--- a/vim/snippets/html/doctype/HTML 5.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE HTML>
-
diff --git a/vim/snippets/html/doctype/XHTML 1.0 Frameset.snippet b/vim/snippets/html/doctype/XHTML 1.0 Frameset.snippet
deleted file mode 100755
index 831094b..0000000
--- a/vim/snippets/html/doctype/XHTML 1.0 Frameset.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/vim/snippets/html/doctype/XHTML 1.0 Strict.snippet b/vim/snippets/html/doctype/XHTML 1.0 Strict.snippet
deleted file mode 100755
index 831094b..0000000
--- a/vim/snippets/html/doctype/XHTML 1.0 Strict.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
\ No newline at end of file
diff --git a/vim/snippets/html/doctype/XHTML 1.0 Transitional.snippet b/vim/snippets/html/doctype/XHTML 1.0 Transitional.snippet
deleted file mode 100755
index c005382..0000000
--- a/vim/snippets/html/doctype/XHTML 1.0 Transitional.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
\ No newline at end of file
diff --git a/vim/snippets/html/doctype/XHTML 1.1.snippet b/vim/snippets/html/doctype/XHTML 1.1.snippet
deleted file mode 100755
index b805e7b..0000000
--- a/vim/snippets/html/doctype/XHTML 1.1.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\ No newline at end of file
diff --git a/vim/snippets/html/form.snippet b/vim/snippets/html/form.snippet
deleted file mode 100755
index 6fa8a22..0000000
--- a/vim/snippets/html/form.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-<form action="${1:action}" method="${2:post}" accept-charset="utf-8">
-  ${3}
-
-  <p><input type="submit" value="Continue &rarr;"/></p>
-</form>
diff --git a/vim/snippets/html/h1.snippet b/vim/snippets/html/h1.snippet
deleted file mode 100755
index 21e88b8..0000000
--- a/vim/snippets/html/h1.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<h1 id="${1}">${2}</h1>
diff --git a/vim/snippets/html/h2.snippet b/vim/snippets/html/h2.snippet
deleted file mode 100755
index 4634927..0000000
--- a/vim/snippets/html/h2.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<h2${1}>${2}</h2>${3}
diff --git a/vim/snippets/html/h3.snippet b/vim/snippets/html/h3.snippet
deleted file mode 100755
index 4f2bd48..0000000
--- a/vim/snippets/html/h3.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<h3${1}>${2}</h3>${3}
diff --git a/vim/snippets/html/head.snippet b/vim/snippets/html/head.snippet
deleted file mode 100755
index 3fde542..0000000
--- a/vim/snippets/html/head.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-<head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-  <title>${1:`substitute(Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
-  ${2}
-</head>
diff --git a/vim/snippets/html/href.snippet b/vim/snippets/html/href.snippet
deleted file mode 100644
index 0b744a0..0000000
--- a/vim/snippets/html/href.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<a href="${1}">${2}</a>
diff --git a/vim/snippets/html/ifie.snippet b/vim/snippets/html/ifie.snippet
deleted file mode 100755
index abb68f5..0000000
--- a/vim/snippets/html/ifie.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<!--[if IE ${1:6}]>${2}<![endif]-->${3}
diff --git a/vim/snippets/html/img.snippet b/vim/snippets/html/img.snippet
deleted file mode 100755
index ba32a24..0000000
--- a/vim/snippets/html/img.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<img src="${1}"${2} />
diff --git a/vim/snippets/html/input.snippet b/vim/snippets/html/input.snippet
deleted file mode 100755
index a8814b2..0000000
--- a/vim/snippets/html/input.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<input type="${1:text/submit/hidden/button}" name="${2}" value="${3:value}" id="${4:$2}"/>${5}
diff --git a/vim/snippets/html/inputl.snippet b/vim/snippets/html/inputl.snippet
deleted file mode 100755
index 4efe994..0000000
--- a/vim/snippets/html/inputl.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-<label for="${1:input_id}">${2}</label>
-<input type="${3:text/submit/hidden/button}" name="${4:$1}" value="${5:value}" id="${6:$1}"/>${7}
diff --git a/vim/snippets/html/label.snippet b/vim/snippets/html/label.snippet
deleted file mode 100755
index c32b6f7..0000000
--- a/vim/snippets/html/label.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<label for="${1:id}">${2:label_text}</label>
diff --git a/vim/snippets/html/li.snippet b/vim/snippets/html/li.snippet
deleted file mode 100755
index 2749ac2..0000000
--- a/vim/snippets/html/li.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<li${1}>${2}</li>${3}
diff --git a/vim/snippets/html/link.snippet b/vim/snippets/html/link.snippet
deleted file mode 100755
index 42dd1c6..0000000
--- a/vim/snippets/html/link.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<link rel="${1:stylesheet}" href="${2:path-to-stylesheet}.css" type="text/css" media="${3:screen}" charset="${4:utf-8}"/>${5}
diff --git a/vim/snippets/html/mailto.snippet b/vim/snippets/html/mailto.snippet
deleted file mode 100755
index 2538ab0..0000000
--- a/vim/snippets/html/mailto.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<a href="mailto:<+email+><+?subject=<+feedback+>+>"><+email me+></a>
diff --git a/vim/snippets/html/meta.snippet b/vim/snippets/html/meta.snippet
deleted file mode 100755
index e0319b0..0000000
--- a/vim/snippets/html/meta.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<meta name="${1:name}" content="${2:content}"/>
diff --git a/vim/snippets/html/movie.snippet b/vim/snippets/html/movie.snippet
deleted file mode 100755
index d37ae0c..0000000
--- a/vim/snippets/html/movie.snippet
+++ /dev/null
@@ -1,12 +0,0 @@
-<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
-  codebase="http://www.apple.com/qtactivex/qtplugin.cab">
-  <param name="src" value="$1"`Close()`>
-  <param name="controller" value="$4"`Close()`>
-  <param name="autoplay" value="$5"`Close()`>
-  <embed src="${1:movie.mov}"
-    width="${2:320}" height="${3:240}"
-    controller="${4:true}" autoplay="${5:true}"
-    scale="tofit" cache="true"
-    pluginspage="http://www.apple.com/quicktime/download/"
-  `Close()[1:]`>
-</object>${6}
diff --git a/vim/snippets/html/ol.snippet b/vim/snippets/html/ol.snippet
deleted file mode 100755
index 74e45ec..0000000
--- a/vim/snippets/html/ol.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<ol${1}>
-	<li>${2}</li>
-	${3}
-</ol>${4}
diff --git a/vim/snippets/html/option.snippet b/vim/snippets/html/option.snippet
deleted file mode 100755
index b7383d0..0000000
--- a/vim/snippets/html/option.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<option value="${1}">${2}</option>
diff --git a/vim/snippets/html/p.snippet b/vim/snippets/html/p.snippet
deleted file mode 100755
index f07aecd..0000000
--- a/vim/snippets/html/p.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<p${1}>
-	${2}
-</p>${3}
diff --git a/vim/snippets/html/php.snippet b/vim/snippets/html/php.snippet
deleted file mode 100755
index b128e8d..0000000
--- a/vim/snippets/html/php.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php ${1} ?>
diff --git a/vim/snippets/html/script/include_script.snippet b/vim/snippets/html/script/include_script.snippet
deleted file mode 100755
index dd35e4b..0000000
--- a/vim/snippets/html/script/include_script.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<script src="${1:url}" type="text/javascript" charset="utf-8"></script>${2}
diff --git a/vim/snippets/html/script/inline_script.snippet b/vim/snippets/html/script/inline_script.snippet
deleted file mode 100755
index 586171a..0000000
--- a/vim/snippets/html/script/inline_script.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/javascript" language="javascript" charset="utf-8">
-//<![CDATA[
-	${1}
-//]]>
-</script>${2}
diff --git a/vim/snippets/html/select.snippet b/vim/snippets/html/select.snippet
deleted file mode 100755
index 252e3f7..0000000
--- a/vim/snippets/html/select.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<select name="${1}" id="${2}">
-	${3}
-</select>
diff --git a/vim/snippets/html/skel/HTML 4 Strict.snippet b/vim/snippets/html/skel/HTML 4 Strict.snippet
deleted file mode 100755
index 8b555a0..0000000
--- a/vim/snippets/html/skel/HTML 4 Strict.snippet	
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-	<title>${1:Untitled}</title>
-
-	<link rel="stylesheet" type="text/css" href="${2:stylesheets/master.css}">${3}
-</head>
-<body>
-
-${4}
-
-</body>
-</html>
diff --git a/vim/snippets/html/skel/HTML 5.snippet b/vim/snippets/html/skel/HTML 5.snippet
deleted file mode 100755
index bedf7bc..0000000
--- a/vim/snippets/html/skel/HTML 5.snippet	
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-
-	<title>${1:Untitled}</title>
-
-	<link rel="stylesheet" href="${2:stylesheets/master.css}" />${3}
-
-  <!--[if IE]><script>var e=("abbr,article,aside,audio,canvas,datalist,details,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video").split(',');for(var i=0;i<e.length;i++){document.createElement(e[i]);}</script><![endif]-->
-</head>
-<body>
-
-${4}
-
-</body>
-</html>
diff --git a/vim/snippets/html/skel/XHTML 1.0 Strict.snippet b/vim/snippets/html/skel/XHTML 1.0 Strict.snippet
deleted file mode 100755
index b7d5bf6..0000000
--- a/vim/snippets/html/skel/XHTML 1.0 Strict.snippet	
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-	<title>${1:Untitled}</title>
-
-	<link rel="stylesheet" type="text/css" href="${2:stylesheets/master.css}" />${3}
-</head>
-<body>
-
-${4}
-
-</body>
-</html>
diff --git a/vim/snippets/html/skel/basic.snippet b/vim/snippets/html/skel/basic.snippet
deleted file mode 100644
index 61ec244..0000000
--- a/vim/snippets/html/skel/basic.snippet
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
-Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>${1:Page Title}</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	</head>
-
-	<body>
-		${2}
-	</body>
-</html>
diff --git a/vim/snippets/html/skel/basic_with_meta.snippet b/vim/snippets/html/skel/basic_with_meta.snippet
deleted file mode 100644
index b6de9f8..0000000
--- a/vim/snippets/html/skel/basic_with_meta.snippet
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
-Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>${1:Page Title}</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-		<meta name="keywords" content=""/>
-		<meta name="description" content=""/>
-	</head>
-
-	<body>
-		${2}
-	</body>
-</html>
diff --git a/vim/snippets/html/skel/html5.snippet b/vim/snippets/html/skel/html5.snippet
deleted file mode 100755
index 855deab..0000000
--- a/vim/snippets/html/skel/html5.snippet
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="pt-BR">
-    <head>
-      <title>${1:Page Title}</title>
-
-        <meta charset="utf-8">
-        <meta name="keywords" content=""/>
-        <meta name="description" content=""/>
-
-        <link rel="stylesheet" href="css/style.css" media="screen" charset="utf-8">
-        <link rel="shortcut icon" href="favicon.ico">
-
-        <!--[if IE]>
-          <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-        <![endif]-->
-    </head>
-
-    <body>
-      <header>
-      </header>
-
-      <section id="main">
-      </section>
-
-      <footer>
-      </footer>
-    </body>
-</html>
diff --git a/vim/snippets/html/span.snippet b/vim/snippets/html/span.snippet
deleted file mode 100755
index 17589b0..0000000
--- a/vim/snippets/html/span.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<span class="${1:name}">${2}</span>
diff --git a/vim/snippets/html/style.snippet b/vim/snippets/html/style.snippet
deleted file mode 100755
index 26ae0fe..0000000
--- a/vim/snippets/html/style.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<style type="text/css" media="screen">
-  ${1}
-</style>
diff --git a/vim/snippets/html/t.snippet b/vim/snippets/html/t.snippet
deleted file mode 100755
index 9edc26a..0000000
--- a/vim/snippets/html/t.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<${1:div}${2}>
-  ${3}
-</$1>
diff --git a/vim/snippets/html/table/basic.snippet b/vim/snippets/html/table/basic.snippet
deleted file mode 100755
index 2100d13..0000000
--- a/vim/snippets/html/table/basic.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<table class="${1}">
-	${2}
-</table>
diff --git a/vim/snippets/html/table/hardcore.snippet b/vim/snippets/html/table/hardcore.snippet
deleted file mode 100755
index 61900cc..0000000
--- a/vim/snippets/html/table/hardcore.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-<table>
-	<tr>
-		<th>${1}</th>
-	</tr>
-
-	<tr>
-		<td></td>
-	</tr>
-</table>
diff --git a/vim/snippets/html/textarea.snippet b/vim/snippets/html/textarea.snippet
deleted file mode 100755
index 0b3fb84..0000000
--- a/vim/snippets/html/textarea.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<textarea name="${1:Name}" rows="${2:8}" cols="${2:40}">${3}</textarea>
diff --git a/vim/snippets/html/ti.snippet b/vim/snippets/html/ti.snippet
deleted file mode 100755
index 7a700d9..0000000
--- a/vim/snippets/html/ti.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<${1:span}${2}>${3}</$1>
diff --git a/vim/snippets/html/tt.snippet b/vim/snippets/html/tt.snippet
deleted file mode 100755
index 20f466e..0000000
--- a/vim/snippets/html/tt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<tt>${1}</tt>${2}
diff --git a/vim/snippets/html/ul.snippet b/vim/snippets/html/ul.snippet
deleted file mode 100755
index 63561a9..0000000
--- a/vim/snippets/html/ul.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<ul${1}>
-	<li>${2}</li>
-	${3}
-</ul>${4}
diff --git a/vim/snippets/java/class/basic+constructor+main.snippet b/vim/snippets/java/class/basic+constructor+main.snippet
deleted file mode 100755
index 3bd770e..0000000
--- a/vim/snippets/java/class/basic+constructor+main.snippet
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * class $2
- * @author ${4:`g:snips_author`}
- */
-${1:public} class ${2:`Snippet_JavaClassNameFromFilename()`}${3} {
-
-	/**
-	  * Constructor for $2
-	  */
-	public $2(${4}) {
-		${5}
-	}
-
-	public static void main(String args[]) {
-	}
-
-}
diff --git a/vim/snippets/java/class/basic+constructor.snippet b/vim/snippets/java/class/basic+constructor.snippet
deleted file mode 100755
index 05eabef..0000000
--- a/vim/snippets/java/class/basic+constructor.snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * class $2
- * @author ${4:`g:snips_author`}
- */
-${1:public} class ${2:`Snippet_JavaClassNameFromFilename()`}${3} {
-
-	/**
-	  * Constructor for $2
-	  */
-	public $2(${5}){
-		${6}
-	}
-
-}
diff --git a/vim/snippets/java/class/basic.snippet b/vim/snippets/java/class/basic.snippet
deleted file mode 100755
index 05eabef..0000000
--- a/vim/snippets/java/class/basic.snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * class $2
- * @author ${4:`g:snips_author`}
- */
-${1:public} class ${2:`Snippet_JavaClassNameFromFilename()`}${3} {
-
-	/**
-	  * Constructor for $2
-	  */
-	public $2(${5}){
-		${6}
-	}
-
-}
diff --git a/vim/snippets/java/for.snippet b/vim/snippets/java/for.snippet
deleted file mode 100755
index 70a4108..0000000
--- a/vim/snippets/java/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for(${1:int i=0}; ${2:condition}; ${3:i++}){
-	${4}
-}
diff --git a/vim/snippets/java/gs.snippet b/vim/snippets/java/gs.snippet
deleted file mode 100755
index 954a9a0..0000000
--- a/vim/snippets/java/gs.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-//getter for $3
-public ${2:variable_type} get${1:VariableName}() {
-    return ${3:variableName};
-}
-
-//setter for $3
-public void set$1($2 $3) {
-   this.$3 = $3;
-}${4}
diff --git a/vim/snippets/java/if.snippet b/vim/snippets/java/if.snippet
deleted file mode 100755
index b9d1c5c..0000000
--- a/vim/snippets/java/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if(${1}){
-	${2}
-}
diff --git a/vim/snippets/java/ife.snippet b/vim/snippets/java/ife.snippet
deleted file mode 100755
index a7e43d0..0000000
--- a/vim/snippets/java/ife.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-if(${1}){
-	${2}
-}else{
-}
diff --git a/vim/snippets/java/log.snippet b/vim/snippets/java/log.snippet
deleted file mode 100755
index abb7c7d..0000000
--- a/vim/snippets/java/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-System.${1:out}.println(${2});
diff --git a/vim/snippets/java/m.snippet b/vim/snippets/java/m.snippet
deleted file mode 100755
index 67bf3fb..0000000
--- a/vim/snippets/java/m.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * ${7:Method Description}
- * ${5}
- * @return ${6}
- */
-${1:public} ${2:void} ${3:methodName}(${4}) {
-	${8}
-}
diff --git a/vim/snippets/javascript-jquery/add.snippet b/vim/snippets/javascript-jquery/add.snippet
deleted file mode 100755
index 3bf9756..0000000
--- a/vim/snippets/javascript-jquery/add.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.add('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/addClass.snippet b/vim/snippets/javascript-jquery/addClass.snippet
deleted file mode 100755
index 6800774..0000000
--- a/vim/snippets/javascript-jquery/addClass.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.addClass('${2:class name}')${3}
diff --git a/vim/snippets/javascript-jquery/after.snippet b/vim/snippets/javascript-jquery/after.snippet
deleted file mode 100755
index 34d1956..0000000
--- a/vim/snippets/javascript-jquery/after.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.after('${2:Some text <b>and bold!</b>}')${3}
diff --git a/vim/snippets/javascript-jquery/ajax.snippet b/vim/snippets/javascript-jquery/ajax.snippet
deleted file mode 100755
index 5453a25..0000000
--- a/vim/snippets/javascript-jquery/ajax.snippet
+++ /dev/null
@@ -1,18 +0,0 @@
-$.ajax({
-	url: "${1:mydomain.com/url}",
-	type: "${2:POST}",
-	dataType: "${3:xml/html/script/json}",
-	data: $.param( $("${4:Element or Expression}") ),
-
-	complete: function() {
-		${5://called when complete}
-	},
-
-	success: function() {
-		${6://called when successful}
-	},
-
-	error: function() {
-		${7://called when there is an error}
-	},
-});
diff --git a/vim/snippets/javascript-jquery/ajaxerror.snippet b/vim/snippets/javascript-jquery/ajaxerror.snippet
deleted file mode 100755
index 0f8ccda..0000000
--- a/vim/snippets/javascript-jquery/ajaxerror.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-.ajaxError(function(${1:request, settings}) {
-	${2://stuff to do when an AJAX call returns an error};
-});
-${3}
diff --git a/vim/snippets/javascript-jquery/ajaxget.snippet b/vim/snippets/javascript-jquery/ajaxget.snippet
deleted file mode 100755
index 1489859..0000000
--- a/vim/snippets/javascript-jquery/ajaxget.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-$.get('${1:/test/ajax-test.xml}', function(xml){
-	${2:alert( ("title",xml).text() ) //optional stuff to do after get;}
-});
diff --git a/vim/snippets/javascript-jquery/ajaxgetif.snippet b/vim/snippets/javascript-jquery/ajaxgetif.snippet
deleted file mode 100755
index 0f4d1ef..0000000
--- a/vim/snippets/javascript-jquery/ajaxgetif.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-$.getIfModified('${1:/test/test.cgi}', function(data){
-	${2:alert( "Data loaded: " + data ) //optional stuff to do after get;}
-});
diff --git a/vim/snippets/javascript-jquery/ajaxpost.snippet b/vim/snippets/javascript-jquery/ajaxpost.snippet
deleted file mode 100755
index f62bf10..0000000
--- a/vim/snippets/javascript-jquery/ajaxpost.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-$.post('<+/path/to/file.cgi+>',{
- <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+>},
- function(){
-    <+//stuff to do after event occurs;+>
-});
diff --git a/vim/snippets/javascript-jquery/ajaxsend.snippet b/vim/snippets/javascript-jquery/ajaxsend.snippet
deleted file mode 100755
index 4b74cd9..0000000
--- a/vim/snippets/javascript-jquery/ajaxsend.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-.ajaxSend(function(${1:request, settings}) {
-	${2://stuff to do when an AJAX call returns an error};
-});
-${3}
diff --git a/vim/snippets/javascript-jquery/ajaxsetup.snippet b/vim/snippets/javascript-jquery/ajaxsetup.snippet
deleted file mode 100755
index c5b4ad0..0000000
--- a/vim/snippets/javascript-jquery/ajaxsetup.snippet
+++ /dev/null
@@ -1,18 +0,0 @@
-$.ajaxSetup({
-	url: "${1:mydomain.com/url}",
-	type: "${2:POST}",
-	dataType: "${3:xml/html/script/json}",
-	data: $.param( $("${4:Element or Expression}") ),
-
-	complete: function() {
-		${5://called when complete}
-	},
-
-	success: function() {
-		${6://called when successful}
-	},
-
-	error: function() {
-		${7://called when there is an error}
-	},
-});
diff --git a/vim/snippets/javascript-jquery/ajaxstart.snippet b/vim/snippets/javascript-jquery/ajaxstart.snippet
deleted file mode 100755
index 3caafd5..0000000
--- a/vim/snippets/javascript-jquery/ajaxstart.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-$.ajaxStart(function() {
-	${1://stuff to do when an AJAX call is started and no other AJAX calls are in progress};
-});
-${2}
diff --git a/vim/snippets/javascript-jquery/ajaxstop.snippet b/vim/snippets/javascript-jquery/ajaxstop.snippet
deleted file mode 100755
index 6088a9f..0000000
--- a/vim/snippets/javascript-jquery/ajaxstop.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-$.ajaxStop(function() {
-	${1://stuff to do when an AJAX call is started and no other AJAX calls are in progress};
-});
-${2}
diff --git a/vim/snippets/javascript-jquery/ajaxsuccess.snippet b/vim/snippets/javascript-jquery/ajaxsuccess.snippet
deleted file mode 100755
index ba2247d..0000000
--- a/vim/snippets/javascript-jquery/ajaxsuccess.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-$.ajaxSuccess(function() {
-  ${1://stuff to do when an AJAX call is started and no other AJAX calls are in progress};
-});
-${2}
diff --git a/vim/snippets/javascript-jquery/animate.snippet b/vim/snippets/javascript-jquery/animate.snippet
deleted file mode 100755
index 1913532..0000000
--- a/vim/snippets/javascript-jquery/animate.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})${4}
diff --git a/vim/snippets/javascript-jquery/append.snippet b/vim/snippets/javascript-jquery/append.snippet
deleted file mode 100755
index bc4ff4d..0000000
--- a/vim/snippets/javascript-jquery/append.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.append('${2:Some text <b>and bold!</b>}')${3}
diff --git a/vim/snippets/javascript-jquery/appendTo.snippet b/vim/snippets/javascript-jquery/appendTo.snippet
deleted file mode 100755
index 9788371..0000000
--- a/vim/snippets/javascript-jquery/appendTo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.appendTo('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/attr.snippet b/vim/snippets/javascript-jquery/attr.snippet
deleted file mode 100755
index fb7e2f4..0000000
--- a/vim/snippets/javascript-jquery/attr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.attr('${2:attribute}', '${3:value}')${4}
diff --git a/vim/snippets/javascript-jquery/attrm.snippet b/vim/snippets/javascript-jquery/attrm.snippet
deleted file mode 100755
index 1568551..0000000
--- a/vim/snippets/javascript-jquery/attrm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})${6}
diff --git a/vim/snippets/javascript-jquery/before.snippet b/vim/snippets/javascript-jquery/before.snippet
deleted file mode 100755
index e12c4ae..0000000
--- a/vim/snippets/javascript-jquery/before.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.before('${2:Some text <b>and bold!</b>}')${3}
diff --git a/vim/snippets/javascript-jquery/bind.snippet b/vim/snippets/javascript-jquery/bind.snippet
deleted file mode 100755
index dda284d..0000000
--- a/vim/snippets/javascript-jquery/bind.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.bind('${2:event name}', function(${3:event}) {
-	${4:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/blur.snippet b/vim/snippets/javascript-jquery/blur.snippet
deleted file mode 100755
index 674623d..0000000
--- a/vim/snippets/javascript-jquery/blur.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.blur(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/change.snippet b/vim/snippets/javascript-jquery/change.snippet
deleted file mode 100755
index 184f8a9..0000000
--- a/vim/snippets/javascript-jquery/change.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.change(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/children.snippet b/vim/snippets/javascript-jquery/children.snippet
deleted file mode 100755
index 2db688b..0000000
--- a/vim/snippets/javascript-jquery/children.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.children('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/click.snippet b/vim/snippets/javascript-jquery/click.snippet
deleted file mode 100755
index d17a047..0000000
--- a/vim/snippets/javascript-jquery/click.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.click(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/clone.snippet b/vim/snippets/javascript-jquery/clone.snippet
deleted file mode 100755
index 83b0b42..0000000
--- a/vim/snippets/javascript-jquery/clone.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.clone()${2}
diff --git a/vim/snippets/javascript-jquery/contains.snippet b/vim/snippets/javascript-jquery/contains.snippet
deleted file mode 100755
index 2a07394..0000000
--- a/vim/snippets/javascript-jquery/contains.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.contains('${2:text to find}')${3}
diff --git a/vim/snippets/javascript-jquery/css.snippet b/vim/snippets/javascript-jquery/css.snippet
deleted file mode 100755
index 408199e..0000000
--- a/vim/snippets/javascript-jquery/css.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.css('${2:attribute}', '${3:value}')${4}
diff --git a/vim/snippets/javascript-jquery/cssm.snippet b/vim/snippets/javascript-jquery/cssm.snippet
deleted file mode 100755
index 7eebe1e..0000000
--- a/vim/snippets/javascript-jquery/cssm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})${6}
diff --git a/vim/snippets/javascript-jquery/dblclick.snippet b/vim/snippets/javascript-jquery/dblclick.snippet
deleted file mode 100755
index 4b2d6b2..0000000
--- a/vim/snippets/javascript-jquery/dblclick.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.dblclick(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/each.snippet b/vim/snippets/javascript-jquery/each.snippet
deleted file mode 100755
index 05beed2..0000000
--- a/vim/snippets/javascript-jquery/each.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.each(function(index) {
-	${2:this.innerHTML = this + " is the element, " + index + " is the position";}
-});
diff --git a/vim/snippets/javascript-jquery/el.snippet b/vim/snippets/javascript-jquery/el.snippet
deleted file mode 100755
index d206523..0000000
--- a/vim/snippets/javascript-jquery/el.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$('${1}')${2:}
diff --git a/vim/snippets/javascript-jquery/eltrim.snippet b/vim/snippets/javascript-jquery/eltrim.snippet
deleted file mode 100755
index 9cc0d69..0000000
--- a/vim/snippets/javascript-jquery/eltrim.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$.trim('${1:string}')${2}
diff --git a/vim/snippets/javascript-jquery/end.snippet b/vim/snippets/javascript-jquery/end.snippet
deleted file mode 100755
index 293102c..0000000
--- a/vim/snippets/javascript-jquery/end.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.end()${2}
diff --git a/vim/snippets/javascript-jquery/error.snippet b/vim/snippets/javascript-jquery/error.snippet
deleted file mode 100755
index 23b0e65..0000000
--- a/vim/snippets/javascript-jquery/error.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.error(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/fadein.snippet b/vim/snippets/javascript-jquery/fadein.snippet
deleted file mode 100755
index 549d846..0000000
--- a/vim/snippets/javascript-jquery/fadein.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.fadeIn('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/fadeinc.snippet b/vim/snippets/javascript-jquery/fadeinc.snippet
deleted file mode 100755
index 9090853..0000000
--- a/vim/snippets/javascript-jquery/fadeinc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.fadeIn('slow/400/fast', function() {
-	${2://Stuff to do *after* the animation takes place};
-});
diff --git a/vim/snippets/javascript-jquery/fadeout.snippet b/vim/snippets/javascript-jquery/fadeout.snippet
deleted file mode 100755
index 24d6c76..0000000
--- a/vim/snippets/javascript-jquery/fadeout.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.fadeOut('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/fadeoutc.snippet b/vim/snippets/javascript-jquery/fadeoutc.snippet
deleted file mode 100755
index 76d5457..0000000
--- a/vim/snippets/javascript-jquery/fadeoutc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.fadeOut('slow/400/fast', function() {
-	${2://Stuff to do *after* the animation takes place};
-});
diff --git a/vim/snippets/javascript-jquery/fadeto.snippet b/vim/snippets/javascript-jquery/fadeto.snippet
deleted file mode 100755
index b0e584a..0000000
--- a/vim/snippets/javascript-jquery/fadeto.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})${4}
diff --git a/vim/snippets/javascript-jquery/fadetoc.snippet b/vim/snippets/javascript-jquery/fadetoc.snippet
deleted file mode 100755
index 17243b4..0000000
--- a/vim/snippets/javascript-jquery/fadetoc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.fadeTo('slow/400/fast', ${2:0.5}, function() {
-	${3://Stuff to do *after* the animation takes place};
-});
diff --git a/vim/snippets/javascript-jquery/filter.snippet b/vim/snippets/javascript-jquery/filter.snippet
deleted file mode 100755
index d33fdf2..0000000
--- a/vim/snippets/javascript-jquery/filter.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.filter('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/find.snippet b/vim/snippets/javascript-jquery/find.snippet
deleted file mode 100755
index 1791e91..0000000
--- a/vim/snippets/javascript-jquery/find.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.find('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/focus.snippet b/vim/snippets/javascript-jquery/focus.snippet
deleted file mode 100755
index 3b1b571..0000000
--- a/vim/snippets/javascript-jquery/focus.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.focus(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/get.snippet b/vim/snippets/javascript-jquery/get.snippet
deleted file mode 100755
index 4374c18..0000000
--- a/vim/snippets/javascript-jquery/get.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.get(${2:element index})${3}
diff --git a/vim/snippets/javascript-jquery/getjson.snippet b/vim/snippets/javascript-jquery/getjson.snippet
deleted file mode 100755
index 518d676..0000000
--- a/vim/snippets/javascript-jquery/getjson.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-$.getJSON('<+/path/to/file.cgi+>',{
- <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+>},
- function(json){
-    <+//stuff to do after event occurs;+>
-});
diff --git a/vim/snippets/javascript-jquery/getscript.snippet b/vim/snippets/javascript-jquery/getscript.snippet
deleted file mode 100755
index 0b62d90..0000000
--- a/vim/snippets/javascript-jquery/getscript.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-$.getScript('${1:somescript.js}', function(){
-	${2://optional stuff to do after getScript;}
-});
diff --git a/vim/snippets/javascript-jquery/height.snippet b/vim/snippets/javascript-jquery/height.snippet
deleted file mode 100755
index 1515d5c..0000000
--- a/vim/snippets/javascript-jquery/height.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.height(${2:integer})${3}
diff --git a/vim/snippets/javascript-jquery/hide.snippet b/vim/snippets/javascript-jquery/hide.snippet
deleted file mode 100755
index c8071cb..0000000
--- a/vim/snippets/javascript-jquery/hide.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.hide('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/hidec.snippet b/vim/snippets/javascript-jquery/hidec.snippet
deleted file mode 100755
index 62f2280..0000000
--- a/vim/snippets/javascript-jquery/hidec.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.hide('${2:slow/400/fast}', function() {
-	${3://Stuff to do *after* the animation takes place}
-});
diff --git a/vim/snippets/javascript-jquery/hover.snippet b/vim/snippets/javascript-jquery/hover.snippet
deleted file mode 100755
index d8468c1..0000000
--- a/vim/snippets/javascript-jquery/hover.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-${1:obj}.hover(function() {
-	${2:// Stuff to do when the mouse enters the element;}
-}, function() {
-	${3:// Stuff to do when the mouse leaves the element;}
-});${4}
diff --git a/vim/snippets/javascript-jquery/html.snippet b/vim/snippets/javascript-jquery/html.snippet
deleted file mode 100755
index 0c5a25e..0000000
--- a/vim/snippets/javascript-jquery/html.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.html('${2:Some text <b>and bold!</b>}')${3}
diff --git a/vim/snippets/javascript-jquery/insertAfter.snippet b/vim/snippets/javascript-jquery/insertAfter.snippet
deleted file mode 100755
index 66c389e..0000000
--- a/vim/snippets/javascript-jquery/insertAfter.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.insertAfter('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/insertBefore.snippet b/vim/snippets/javascript-jquery/insertBefore.snippet
deleted file mode 100755
index e7090d4..0000000
--- a/vim/snippets/javascript-jquery/insertBefore.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.insertBefore('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/is.snippet b/vim/snippets/javascript-jquery/is.snippet
deleted file mode 100755
index 28eefb0..0000000
--- a/vim/snippets/javascript-jquery/is.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.is('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/jj.snippet b/vim/snippets/javascript-jquery/jj.snippet
deleted file mode 100755
index 7342abc..0000000
--- a/vim/snippets/javascript-jquery/jj.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$('${1:selector}')${2}
diff --git a/vim/snippets/javascript-jquery/load.snippet b/vim/snippets/javascript-jquery/load.snippet
deleted file mode 100755
index 1f09fbc..0000000
--- a/vim/snippets/javascript-jquery/load.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.load(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/loadf.snippet b/vim/snippets/javascript-jquery/loadf.snippet
deleted file mode 100755
index 2e7d9c8..0000000
--- a/vim/snippets/javascript-jquery/loadf.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<+obj+>.load('<+/path/to/file.htm+>', { <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+> }, function() {
-	<+// Stuff to do after the page is loaded+>
-});
\ No newline at end of file
diff --git a/vim/snippets/javascript-jquery/loadif.snippet b/vim/snippets/javascript-jquery/loadif.snippet
deleted file mode 100755
index fe45d05..0000000
--- a/vim/snippets/javascript-jquery/loadif.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<+obj+>.loadIfModified('<+/path/to/file.htm+>', { <+<+param1+>: "<+value1+>", <+param2+>: "<+value2+>"+> }, function() {
-	<+// Stuff to do after the page is loaded+>
-});
\ No newline at end of file
diff --git a/vim/snippets/javascript-jquery/mdown.snippet b/vim/snippets/javascript-jquery/mdown.snippet
deleted file mode 100755
index 3be70e1..0000000
--- a/vim/snippets/javascript-jquery/mdown.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.mousedown(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/mmove.snippet b/vim/snippets/javascript-jquery/mmove.snippet
deleted file mode 100755
index eb7ac05..0000000
--- a/vim/snippets/javascript-jquery/mmove.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.mousemove(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/mout.snippet b/vim/snippets/javascript-jquery/mout.snippet
deleted file mode 100755
index f214275..0000000
--- a/vim/snippets/javascript-jquery/mout.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.mouseout(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/mover.snippet b/vim/snippets/javascript-jquery/mover.snippet
deleted file mode 100755
index f1eb19c..0000000
--- a/vim/snippets/javascript-jquery/mover.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.mouseover(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/mup.snippet b/vim/snippets/javascript-jquery/mup.snippet
deleted file mode 100755
index 04fb36a..0000000
--- a/vim/snippets/javascript-jquery/mup.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.mouseup(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/next.snippet b/vim/snippets/javascript-jquery/next.snippet
deleted file mode 100755
index b6a6528..0000000
--- a/vim/snippets/javascript-jquery/next.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.next('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/not.snippet b/vim/snippets/javascript-jquery/not.snippet
deleted file mode 100755
index c6a217f..0000000
--- a/vim/snippets/javascript-jquery/not.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.not('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/one.snippet b/vim/snippets/javascript-jquery/one.snippet
deleted file mode 100755
index cacdbfb..0000000
--- a/vim/snippets/javascript-jquery/one.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.one('${2:event name}', function(${3:event}) {
-	${4:// Act on the event once}
-});
diff --git a/vim/snippets/javascript-jquery/parent.snippet b/vim/snippets/javascript-jquery/parent.snippet
deleted file mode 100755
index 0490f05..0000000
--- a/vim/snippets/javascript-jquery/parent.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.parent('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/parents.snippet b/vim/snippets/javascript-jquery/parents.snippet
deleted file mode 100755
index fb0bd13..0000000
--- a/vim/snippets/javascript-jquery/parents.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.parents('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/plugin.snippet b/vim/snippets/javascript-jquery/plugin.snippet
deleted file mode 100755
index aacbded..0000000
--- a/vim/snippets/javascript-jquery/plugin.snippet
+++ /dev/null
@@ -1,28 +0,0 @@
-// Create Closure
-;(function($) {
-    $.fn.${1} = function(options) {
-        // Extend the defaults, over-writing them with anything passed by the caller
-        var opts = $.extend({}, $.fn.$1.defaults, options);
-		
-        // Iterate over each element
-        return this.each(function() {
-            $this = $(this);
-			
-            // Allow for use of the Metadata plugin
-            var o = $.meta ? $.extend({}, opts, $this.data()) : opts;
-			
-            ${2:YOUR CODE GOES HERE}
-			
-        });
-    };
-	
-    // Additional methods follow the format:
-    // $.fn.$1.format = function(txt) {
-        // FUNCTION STUFF GOES HERE
-    // };
-	
-    // Plugin Defaults
-    $.fn.$1.defaults = {
-		
-    };
-})(jQuery);    // Closure Closed
diff --git a/vim/snippets/javascript-jquery/prepend.snippet b/vim/snippets/javascript-jquery/prepend.snippet
deleted file mode 100755
index bc41d48..0000000
--- a/vim/snippets/javascript-jquery/prepend.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.prepend('${2:Some text <b>and bold!</b>}')${3}
diff --git a/vim/snippets/javascript-jquery/prependto.snippet b/vim/snippets/javascript-jquery/prependto.snippet
deleted file mode 100755
index e440695..0000000
--- a/vim/snippets/javascript-jquery/prependto.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.prependTo('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/prev.snippet b/vim/snippets/javascript-jquery/prev.snippet
deleted file mode 100755
index b7aba64..0000000
--- a/vim/snippets/javascript-jquery/prev.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.prev('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/ready.snippet b/vim/snippets/javascript-jquery/ready.snippet
deleted file mode 100755
index a1d3007..0000000
--- a/vim/snippets/javascript-jquery/ready.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-$(function() {
-  ${1}
-});
diff --git a/vim/snippets/javascript-jquery/remove.snippet b/vim/snippets/javascript-jquery/remove.snippet
deleted file mode 100755
index 4c976a1..0000000
--- a/vim/snippets/javascript-jquery/remove.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.remove()${2}
diff --git a/vim/snippets/javascript-jquery/removeattr.snippet b/vim/snippets/javascript-jquery/removeattr.snippet
deleted file mode 100755
index 267d584..0000000
--- a/vim/snippets/javascript-jquery/removeattr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.removeAttr('${2:attribute name}')${3}
diff --git a/vim/snippets/javascript-jquery/removeclass.snippet b/vim/snippets/javascript-jquery/removeclass.snippet
deleted file mode 100755
index f553803..0000000
--- a/vim/snippets/javascript-jquery/removeclass.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.removeClass('${2:class name}')${3}
diff --git a/vim/snippets/javascript-jquery/reset.snippet b/vim/snippets/javascript-jquery/reset.snippet
deleted file mode 100755
index 777af95..0000000
--- a/vim/snippets/javascript-jquery/reset.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.reset(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/resize.snippet b/vim/snippets/javascript-jquery/resize.snippet
deleted file mode 100755
index b46ac0a..0000000
--- a/vim/snippets/javascript-jquery/resize.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.resize(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/scroll.snippet b/vim/snippets/javascript-jquery/scroll.snippet
deleted file mode 100755
index 7a51244..0000000
--- a/vim/snippets/javascript-jquery/scroll.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.scroll(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/sdown.snippet b/vim/snippets/javascript-jquery/sdown.snippet
deleted file mode 100755
index b39840e..0000000
--- a/vim/snippets/javascript-jquery/sdown.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.slideDown('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/sdownc.snippet b/vim/snippets/javascript-jquery/sdownc.snippet
deleted file mode 100755
index 3404b78..0000000
--- a/vim/snippets/javascript-jquery/sdownc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.slideDown('${2:slow/400/fast}', function() {
-	${3://Stuff to do *after* the animation takes place};
-});
diff --git a/vim/snippets/javascript-jquery/sdupc.snippet b/vim/snippets/javascript-jquery/sdupc.snippet
deleted file mode 100755
index 873c665..0000000
--- a/vim/snippets/javascript-jquery/sdupc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.slideUp('${2:slow/400/fast}', function() {
-	${3://Stuff to do *after* the animation takes place};
-});
diff --git a/vim/snippets/javascript-jquery/select.snippet b/vim/snippets/javascript-jquery/select.snippet
deleted file mode 100755
index 986437e..0000000
--- a/vim/snippets/javascript-jquery/select.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.select(function() {
-	${2:// Act on the event}
-});
diff --git a/vim/snippets/javascript-jquery/show.snippet b/vim/snippets/javascript-jquery/show.snippet
deleted file mode 100755
index 31819b1..0000000
--- a/vim/snippets/javascript-jquery/show.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.show('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/showc.snippet b/vim/snippets/javascript-jquery/showc.snippet
deleted file mode 100755
index 6dc5bac..0000000
--- a/vim/snippets/javascript-jquery/showc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.show('${2:slow/400/fast}', function() {
-	${3://Stuff to do *after* the animation takes place}
-});
diff --git a/vim/snippets/javascript-jquery/sib.snippet b/vim/snippets/javascript-jquery/sib.snippet
deleted file mode 100755
index 014f1f7..0000000
--- a/vim/snippets/javascript-jquery/sib.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.siblings('${2:selector expression}')${3}
diff --git a/vim/snippets/javascript-jquery/size.snippet b/vim/snippets/javascript-jquery/size.snippet
deleted file mode 100755
index 1ba1543..0000000
--- a/vim/snippets/javascript-jquery/size.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.size()${2}
diff --git a/vim/snippets/javascript-jquery/stoggle.snippet b/vim/snippets/javascript-jquery/stoggle.snippet
deleted file mode 100755
index daba37d..0000000
--- a/vim/snippets/javascript-jquery/stoggle.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.slideToggle('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/submit.snippet b/vim/snippets/javascript-jquery/submit.snippet
deleted file mode 100755
index ae98d83..0000000
--- a/vim/snippets/javascript-jquery/submit.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:obj}.submit(function() {
-	${2:// Act on the event once}
-});
diff --git a/vim/snippets/javascript-jquery/sup.snippet b/vim/snippets/javascript-jquery/sup.snippet
deleted file mode 100755
index d844a68..0000000
--- a/vim/snippets/javascript-jquery/sup.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.slideUp('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/text.snippet b/vim/snippets/javascript-jquery/text.snippet
deleted file mode 100755
index 5f667c0..0000000
--- a/vim/snippets/javascript-jquery/text.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.text(${2:'some text'})${3}
diff --git a/vim/snippets/javascript-jquery/this.snippet b/vim/snippets/javascript-jquery/this.snippet
deleted file mode 100755
index b3cee8d..0000000
--- a/vim/snippets/javascript-jquery/this.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$(this)${1}
diff --git a/vim/snippets/javascript-jquery/tog.snippet b/vim/snippets/javascript-jquery/tog.snippet
deleted file mode 100755
index 54f5f17..0000000
--- a/vim/snippets/javascript-jquery/tog.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-${1:obj}.toggle(function() {
-	${2:// Stuff to do every *odd* time the element is clicked;}
-}, function() {
-	${3:// Stuff to do every *even* time the element is clicked;}
-});
-${4}
diff --git a/vim/snippets/javascript-jquery/togclass.snippet b/vim/snippets/javascript-jquery/togclass.snippet
deleted file mode 100755
index 023a4b7..0000000
--- a/vim/snippets/javascript-jquery/togclass.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.toggleClass('${2:class name}')${3}
diff --git a/vim/snippets/javascript-jquery/togsh.snippet b/vim/snippets/javascript-jquery/togsh.snippet
deleted file mode 100755
index 265a62d..0000000
--- a/vim/snippets/javascript-jquery/togsh.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.toggle('${2:slow/400/fast}')${3}
diff --git a/vim/snippets/javascript-jquery/trig.snippet b/vim/snippets/javascript-jquery/trig.snippet
deleted file mode 100755
index f7105e0..0000000
--- a/vim/snippets/javascript-jquery/trig.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.trigger('${2:event name}')${3}
diff --git a/vim/snippets/javascript-jquery/unbind.snippet b/vim/snippets/javascript-jquery/unbind.snippet
deleted file mode 100755
index 0fe423d..0000000
--- a/vim/snippets/javascript-jquery/unbind.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.unbind('${2:event name}')${3}
diff --git a/vim/snippets/javascript-jquery/val.snippet b/vim/snippets/javascript-jquery/val.snippet
deleted file mode 100755
index cafe0b0..0000000
--- a/vim/snippets/javascript-jquery/val.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.val('${2:text}')${3}
diff --git a/vim/snippets/javascript-jquery/width.snippet b/vim/snippets/javascript-jquery/width.snippet
deleted file mode 100755
index 415631c..0000000
--- a/vim/snippets/javascript-jquery/width.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.width(${2:integer})${3}
diff --git a/vim/snippets/javascript-jquery/wrap.snippet b/vim/snippets/javascript-jquery/wrap.snippet
deleted file mode 100755
index 55df53f..0000000
--- a/vim/snippets/javascript-jquery/wrap.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:obj}.wrap('${2:&lt;div class="extra-wrapper"&gt;&lt;/div&gt;}')${3}
diff --git a/vim/snippets/javascript/a.snippet b/vim/snippets/javascript/a.snippet
deleted file mode 100755
index d02b907..0000000
--- a/vim/snippets/javascript/a.snippet
+++ /dev/null
@@ -1 +0,0 @@
-alert(${1:this.element});
diff --git a/vim/snippets/javascript/anon.snippet b/vim/snippets/javascript/anon.snippet
deleted file mode 100755
index fff379e..0000000
--- a/vim/snippets/javascript/anon.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function(${1}) { 
-  ${2}
-};
diff --git a/vim/snippets/javascript/as.snippet b/vim/snippets/javascript/as.snippet
deleted file mode 100755
index 8a88fe4..0000000
--- a/vim/snippets/javascript/as.snippet
+++ /dev/null
@@ -1 +0,0 @@
-alert("${1}");
diff --git a/vim/snippets/javascript/ea.snippet b/vim/snippets/javascript/ea.snippet
deleted file mode 100755
index e77be32..0000000
--- a/vim/snippets/javascript/ea.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-each(function() {
-  
-});
diff --git a/vim/snippets/javascript/for.snippet b/vim/snippets/javascript/for.snippet
deleted file mode 100755
index e1e4d87..0000000
--- a/vim/snippets/javascript/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for (var ${1:i} = 0; $1 < ${2:length}; $1++) {
-	${3}
-}
diff --git a/vim/snippets/javascript/fun.snippet b/vim/snippets/javascript/fun.snippet
deleted file mode 100755
index caf168b..0000000
--- a/vim/snippets/javascript/fun.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function ${1:function_name}(${2:argument}) {
-	${3:// body}
-}
diff --git a/vim/snippets/javascript/if.snippet b/vim/snippets/javascript/if.snippet
deleted file mode 100755
index d81ac04..0000000
--- a/vim/snippets/javascript/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if (${1:true}) { 
-  ${2}
-};
diff --git a/vim/snippets/javascript/ife.snippet b/vim/snippets/javascript/ife.snippet
deleted file mode 100755
index 7adadbc..0000000
--- a/vim/snippets/javascript/ife.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-if (${1:true}) {
-	${2}
-} else {
-}
diff --git a/vim/snippets/javascript/iff.snippet b/vim/snippets/javascript/iff.snippet
deleted file mode 100755
index f4aa67a..0000000
--- a/vim/snippets/javascript/iff.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if (${1:true}) {
-	${2}
-}
diff --git a/vim/snippets/javascript/l.snippet b/vim/snippets/javascript/l.snippet
deleted file mode 100755
index b4cf84f..0000000
--- a/vim/snippets/javascript/l.snippet
+++ /dev/null
@@ -1 +0,0 @@
-console.log(${1});
diff --git a/vim/snippets/javascript/log.snippet b/vim/snippets/javascript/log.snippet
deleted file mode 100755
index b4cf84f..0000000
--- a/vim/snippets/javascript/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-console.log(${1});
diff --git a/vim/snippets/javascript/met.snippet b/vim/snippets/javascript/met.snippet
deleted file mode 100755
index 1c30d61..0000000
--- a/vim/snippets/javascript/met.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:method_name}: function(${2:attribute}){
-  ${3}
-}${4:, }
diff --git a/vim/snippets/javascript/pe.snippet b/vim/snippets/javascript/pe.snippet
deleted file mode 100755
index b86f530..0000000
--- a/vim/snippets/javascript/pe.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:property}: function(event) {
-  ${2:body}
-}
diff --git a/vim/snippets/javascript/pf.snippet b/vim/snippets/javascript/pf.snippet
deleted file mode 100755
index 7798a7e..0000000
--- a/vim/snippets/javascript/pf.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:property}: function() {
-  ${2:body}
-}
diff --git a/vim/snippets/javascript/proto.snippet b/vim/snippets/javascript/proto.snippet
deleted file mode 100755
index 37cd6d4..0000000
--- a/vim/snippets/javascript/proto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:class_name}.prototype.${2:method_name} = function(${3:first_argument}) {
-	${4:// body}
-};
diff --git a/vim/snippets/javascript/t.snippet b/vim/snippets/javascript/t.snippet
deleted file mode 100755
index c47acc6..0000000
--- a/vim/snippets/javascript/t.snippet
+++ /dev/null
@@ -1 +0,0 @@
-I18n.t('${1:type.key}', { defaultValue: '${2}' })${3}
diff --git a/vim/snippets/javascript/timeout.snippet b/vim/snippets/javascript/timeout.snippet
deleted file mode 100755
index 6ea2842..0000000
--- a/vim/snippets/javascript/timeout.snippet
+++ /dev/null
@@ -1 +0,0 @@
-setTimeout(function() { ${1} }, ${2:10});
diff --git a/vim/snippets/jinja.snippets b/vim/snippets/jinja.snippets
deleted file mode 100755
index 0e9c31e..0000000
--- a/vim/snippets/jinja.snippets
+++ /dev/null
@@ -1,8 +0,0 @@
-snippet %
-	{% ${1} %}
-
-snippet {
-	{{ ${1} }}
-
-snippet #
-	{# ${1} #}
diff --git a/vim/snippets/jinja/block.snippet b/vim/snippets/jinja/block.snippet
deleted file mode 100755
index f970843..0000000
--- a/vim/snippets/jinja/block.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% block ${1} %}
-	${2}
-{% endblock %}
diff --git a/vim/snippets/jinja/else.snippet b/vim/snippets/jinja/else.snippet
deleted file mode 100755
index 78b4d0f..0000000
--- a/vim/snippets/jinja/else.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-{% else %}
-${1}
diff --git a/vim/snippets/jinja/extends.snippet b/vim/snippets/jinja/extends.snippet
deleted file mode 100755
index c078b32..0000000
--- a/vim/snippets/jinja/extends.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "${1:base.html}" %}
diff --git a/vim/snippets/jinja/for.snippet b/vim/snippets/jinja/for.snippet
deleted file mode 100755
index da54159..0000000
--- a/vim/snippets/jinja/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for ${1} in ${2} %}
-${3}
-{% endfor %}
diff --git a/vim/snippets/jinja/if.snippet b/vim/snippets/jinja/if.snippet
deleted file mode 100755
index 3cf165a..0000000
--- a/vim/snippets/jinja/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if ${1} %}
-${2}
-{% endif %}
diff --git a/vim/snippets/jinja/include.snippet b/vim/snippets/jinja/include.snippet
deleted file mode 100755
index bb64157..0000000
--- a/vim/snippets/jinja/include.snippet
+++ /dev/null
@@ -1 +0,0 @@
-{% include "${1}" %}
diff --git a/vim/snippets/markdown.snippets b/vim/snippets/markdown.snippets
deleted file mode 100755
index 4a56481..0000000
--- a/vim/snippets/markdown.snippets
+++ /dev/null
@@ -1,51 +0,0 @@
-# [link][]
-snippet []
-	[${1:link_id}][]${2}
-# [link][id]
-snippet [[
-	[${1:link}][${2:id}]${3}
-# [link](url)
-snippet [(
-	[${1:link}](${2:url})${3}
-# [link](email)
-snippet [@
-	[${1:link}](mailto:${2:email})${3}
-# [link](url "title")
-snippet [("
-	[${1:link}](${2:url} "${3:title}")${4}
-# [id]: url "title"
-snippet [:
-	[${1:id}]: http://${2:url} "${3:title}"
-# [id]: email "title"
-snippet [:@
-	[${1:id}]: mailto:${2:url} "${3:title}"
-# ![alt][id]
-snippet ![
-	![${1:alt}][${2:id}]${3}
-# ![alt](url)
-snippet !(
-	![${1:alt}](${2:url})${3}
-# ![alt](url "title")
-snippet !("
-	![${1:alt}](${2:url} "${3:title}")${4}
-# *emphasis* or _emphasis_
-snippet *
-	*${1}*${2}
-snippet _
-	_${1}_${2}
-# **strong** or __strong__
-snippet **
-	**${1}**${2}
-snippet __
-	__${1}__${2}
-# `code`
-snippet `
-	`${1}`${2}
-# ================== (H1)
-snippet ===
-	===========================
-	${1}
-# ------------------ (H2)
-snippet ---
-	---------------------------
-	${1}
diff --git a/vim/snippets/objc/I.snippet b/vim/snippets/objc/I.snippet
deleted file mode 100755
index 0032f65..0000000
--- a/vim/snippets/objc/I.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-+ (void) initialize
-{
-	[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWIthObjectsAndKeys:
-		${1}@"value", @"key",
-		nil]];
-}
diff --git a/vim/snippets/objc/Imp.snippet b/vim/snippets/objc/Imp.snippet
deleted file mode 100755
index 91724d3..0000000
--- a/vim/snippets/objc/Imp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-#import "${1:`Filename()`.h}"${2}
diff --git a/vim/snippets/objc/alloc.snippet b/vim/snippets/objc/alloc.snippet
deleted file mode 100755
index e4d1599..0000000
--- a/vim/snippets/objc/alloc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-[[${1:foo} alloc] init]${2};${3}
diff --git a/vim/snippets/objc/array.snippet b/vim/snippets/objc/array.snippet
deleted file mode 100755
index 45d3ef0..0000000
--- a/vim/snippets/objc/array.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NSMutableArray *${1:array} = [NSMutable array];${2}
diff --git a/vim/snippets/objc/bez.snippet b/vim/snippets/objc/bez.snippet
deleted file mode 100755
index 493aff6..0000000
--- a/vim/snippets/objc/bez.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NSBezierPath *${1:path} = [NSBezierPath bezierPath];${2}
diff --git a/vim/snippets/objc/cat.snippet b/vim/snippets/objc/cat.snippet
deleted file mode 100755
index fd57aae..0000000
--- a/vim/snippets/objc/cat.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-@interface ${1:NSObject} (${2:Category})
-@end
-
-@implementation $1 ($2)
-${3}
-@end
diff --git a/vim/snippets/objc/cati.snippet b/vim/snippets/objc/cati.snippet
deleted file mode 100755
index d285260..0000000
--- a/vim/snippets/objc/cati.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-@interface ${1:NSObject} (${2:Category})
-${3}
-@end
diff --git a/vim/snippets/objc/cli.snippet b/vim/snippets/objc/cli.snippet
deleted file mode 100755
index fa89622..0000000
--- a/vim/snippets/objc/cli.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-@interface ${1:ClassName} : ${2:NSObject}
-{${3}
-}
-${4}
-@end
diff --git a/vim/snippets/objc/dict.snippet b/vim/snippets/objc/dict.snippet
deleted file mode 100755
index 8b2d7e9..0000000
--- a/vim/snippets/objc/dict.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];${2}
diff --git a/vim/snippets/objc/forarray.snippet b/vim/snippets/objc/forarray.snippet
deleted file mode 100755
index d32215d..0000000
--- a/vim/snippets/objc/forarray.snippet
+++ /dev/null
@@ -1,7 +0,0 @@
-unsigned int	${1:object}Count = [${2:array} count];
-
-for (unsigned int index = 0; index < $1Count; index++)
-{
-	${3:id}	$1 = [$2 $1AtIndex:index];
-	${4}
-}
diff --git a/vim/snippets/objc/log.snippet b/vim/snippets/objc/log.snippet
deleted file mode 100755
index 69f9c06..0000000
--- a/vim/snippets/objc/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NSLog(@"${1}"${2});${3}
diff --git a/vim/snippets/objc/m/class method.snippet b/vim/snippets/objc/m/class method.snippet
deleted file mode 100755
index 191ee16..0000000
--- a/vim/snippets/objc/m/class method.snippet	
+++ /dev/null
@@ -1,4 +0,0 @@
-+ (${1:id}) ${2:method}
-{${3}
-	return nil;
-}
diff --git a/vim/snippets/objc/m/method.snippet b/vim/snippets/objc/m/method.snippet
deleted file mode 100755
index 9f7390e..0000000
--- a/vim/snippets/objc/m/method.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-- (${1:id}) ${2:method}
-{${3}
-	${4:return nil;}
-}
diff --git a/vim/snippets/objc/objacc.snippet b/vim/snippets/objc/objacc.snippet
deleted file mode 100755
index 840ebfd..0000000
--- a/vim/snippets/objc/objacc.snippet
+++ /dev/null
@@ -1,11 +0,0 @@
-- (${1:id})${2:thing}
-{
-	return $2;
-}
-
-- (void) set$2:($1)
-{
-	$1 old$2 = $2;
-	$2 = [aValue retain];
-	[old$2 release];
-}
diff --git a/vim/snippets/objc/objc.snippet b/vim/snippets/objc/objc.snippet
deleted file mode 100755
index d667148..0000000
--- a/vim/snippets/objc/objc.snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-@interface ${1:`Filename('', 'object')`} : ${2:NSObject}
-{
-}
-@end
-
-@implementation $1
-- (id) init
-{
-	if (self = [super init])
-	{${3}
-	}
-	return self
-}
-@end
diff --git a/vim/snippets/objc/prop.snippet b/vim/snippets/objc/prop.snippet
deleted file mode 100755
index d77495a..0000000
--- a/vim/snippets/objc/prop.snippet
+++ /dev/null
@@ -1 +0,0 @@
-@property (${1:retain}) ${2:NSSomeClass} *${3:$2};${4}
diff --git a/vim/snippets/objc/rel.snippet b/vim/snippets/objc/rel.snippet
deleted file mode 100755
index 5dea04d..0000000
--- a/vim/snippets/objc/rel.snippet
+++ /dev/null
@@ -1 +0,0 @@
-[${1:foo} release];${2}
diff --git a/vim/snippets/objc/ret.snippet b/vim/snippets/objc/ret.snippet
deleted file mode 100755
index ee8eba4..0000000
--- a/vim/snippets/objc/ret.snippet
+++ /dev/null
@@ -1 +0,0 @@
-[${1:foo} retain];${2}
diff --git a/vim/snippets/objc/sel.snippet b/vim/snippets/objc/sel.snippet
deleted file mode 100755
index 4d4996d..0000000
--- a/vim/snippets/objc/sel.snippet
+++ /dev/null
@@ -1 +0,0 @@
-@selector(${1:method}:)${2}
diff --git a/vim/snippets/objc/sm.snippet b/vim/snippets/objc/sm.snippet
deleted file mode 100755
index af139a9..0000000
--- a/vim/snippets/objc/sm.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-- (${1:id}) ${2:method}:(${3:id})${4:anArgument}
-{
-	$1 res = [super $2:$4];${5}
-	return res;
-}
diff --git a/vim/snippets/objc/syn.snippet b/vim/snippets/objc/syn.snippet
deleted file mode 100755
index eef7581..0000000
--- a/vim/snippets/objc/syn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-@synthesize ${1:NSSomeClass};${2}
diff --git a/vim/snippets/php-cake/actas.snippet b/vim/snippets/php-cake/actas.snippet
deleted file mode 100755
index 8993089..0000000
--- a/vim/snippets/php-cake/actas.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-var $actsAs = array(
-	'${1:BehaviorName}'${2: => ${3:ConfigForBehavior}}
-);
diff --git a/vim/snippets/php-cake/addc.snippet b/vim/snippets/php-cake/addc.snippet
deleted file mode 100755
index 9a885f6..0000000
--- a/vim/snippets/php-cake/addc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->addCrumb('${1:CrumbName}'${2:, '${3:CrumbLink}'}) ?>
diff --git a/vim/snippets/php-cake/aftdel.snippet b/vim/snippets/php-cake/aftdel.snippet
deleted file mode 100755
index 8993d9c..0000000
--- a/vim/snippets/php-cake/aftdel.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function afterDelete() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/aftfin.snippet b/vim/snippets/php-cake/aftfin.snippet
deleted file mode 100755
index 4981233..0000000
--- a/vim/snippets/php-cake/aftfin.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function afterFind() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/aftfind.snippet b/vim/snippets/php-cake/aftfind.snippet
deleted file mode 100755
index a4b1fd3..0000000
--- a/vim/snippets/php-cake/aftfind.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function afterFind(${1:$results}) {
-	${2}
-};
diff --git a/vim/snippets/php-cake/aftsave.snippet b/vim/snippets/php-cake/aftsave.snippet
deleted file mode 100755
index 0a2316f..0000000
--- a/vim/snippets/php-cake/aftsave.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function afterSave(${1:$created}) {
-	${2}
-};
diff --git a/vim/snippets/php-cake/aftss.snippet b/vim/snippets/php-cake/aftss.snippet
deleted file mode 100755
index f651d68..0000000
--- a/vim/snippets/php-cake/aftss.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-function _afterScaffoldSave($method) {
-	${1}
-	return true;
-};
diff --git a/vim/snippets/php-cake/aftsse.snippet b/vim/snippets/php-cake/aftsse.snippet
deleted file mode 100755
index c8c279d..0000000
--- a/vim/snippets/php-cake/aftsse.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-function _afterScaffoldSaveError($method) {
-	${1}
-	return true;
-};
diff --git a/vim/snippets/php-cake/befdel.snippet b/vim/snippets/php-cake/befdel.snippet
deleted file mode 100755
index 0a6f101..0000000
--- a/vim/snippets/php-cake/befdel.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeDelete() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/beffil.snippet b/vim/snippets/php-cake/beffil.snippet
deleted file mode 100755
index 0f73b57..0000000
--- a/vim/snippets/php-cake/beffil.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeFilter() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/beffind.snippet b/vim/snippets/php-cake/beffind.snippet
deleted file mode 100755
index 8007051..0000000
--- a/vim/snippets/php-cake/beffind.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeFind(${1:$queryData}) {
-	${2}
-};
diff --git a/vim/snippets/php-cake/befren.snippet b/vim/snippets/php-cake/befren.snippet
deleted file mode 100755
index da9ed66..0000000
--- a/vim/snippets/php-cake/befren.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeRender() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/befsave.snippet b/vim/snippets/php-cake/befsave.snippet
deleted file mode 100755
index b169a7f..0000000
--- a/vim/snippets/php-cake/befsave.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeSave() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/befsca.snippet b/vim/snippets/php-cake/befsca.snippet
deleted file mode 100755
index af1c231..0000000
--- a/vim/snippets/php-cake/befsca.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-function _beforeScaffold($method) {
-	${1}
-	return true;
-};
diff --git a/vim/snippets/php-cake/befval.snippet b/vim/snippets/php-cake/befval.snippet
deleted file mode 100755
index 81d7d7e..0000000
--- a/vim/snippets/php-cake/befval.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeValidate() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/bt.snippet b/vim/snippets/php-cake/bt.snippet
deleted file mode 100755
index 9c1c6e8..0000000
--- a/vim/snippets/php-cake/bt.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-var $belongsTo = array(
-	'${1:Model}'${2: => array(${3:'className' => '${4:${1:ModelClassName}}',}${5:'foreignKey' => '${6:foreign_key_field}'})}
-);
diff --git a/vim/snippets/php-cake/cbefdel.snippet b/vim/snippets/php-cake/cbefdel.snippet
deleted file mode 100755
index b55eea9..0000000
--- a/vim/snippets/php-cake/cbefdel.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function beforeDelete($controller, $url, $status, $exit) {
-	${1}
-};
diff --git a/vim/snippets/php-cake/cfg.snippet b/vim/snippets/php-cake/cfg.snippet
deleted file mode 100755
index 5f67cfd..0000000
--- a/vim/snippets/php-cake/cfg.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$config['${1:...}'] = ${2:'${3:...}'}
diff --git a/vim/snippets/php-cake/cfl.snippet b/vim/snippets/php-cake/cfl.snippet
deleted file mode 100755
index 7ba0d1b..0000000
--- a/vim/snippets/php-cake/cfl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-echo $content_for_layout
diff --git a/vim/snippets/php-cake/cinit.snippet b/vim/snippets/php-cake/cinit.snippet
deleted file mode 100755
index 9565975..0000000
--- a/vim/snippets/php-cake/cinit.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-function initialize(&$controller) {
-	$this->controller = &$controller;
-	${1}
-};
diff --git a/vim/snippets/php-cake/cri.snippet b/vim/snippets/php-cake/cri.snippet
deleted file mode 100755
index 72dc4fc..0000000
--- a/vim/snippets/php-cake/cri.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:varName} = ClassRegistry::init('${2:ClassName}');
diff --git a/vim/snippets/php-cake/dat.snippet b/vim/snippets/php-cake/dat.snippet
deleted file mode 100755
index 2754cd5..0000000
--- a/vim/snippets/php-cake/dat.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->data${1:['${2:...}']}
diff --git a/vim/snippets/php-cake/dbg.snippet b/vim/snippets/php-cake/dbg.snippet
deleted file mode 100755
index 974db04..0000000
--- a/vim/snippets/php-cake/dbg.snippet
+++ /dev/null
@@ -1 +0,0 @@
-debug(${1:$var});
diff --git a/vim/snippets/php-cake/dela.snippet b/vim/snippets/php-cake/dela.snippet
deleted file mode 100755
index c038105..0000000
--- a/vim/snippets/php-cake/dela.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->deleteAll(${2:$conditions}${3:, ${4: $cascade}})
diff --git a/vim/snippets/php-cake/ele.snippet b/vim/snippets/php-cake/ele.snippet
deleted file mode 100755
index e2f1bf9..0000000
--- a/vim/snippets/php-cake/ele.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $this->element('${1:path/to/element}') ?>
diff --git a/vim/snippets/php-cake/fchk.snippet b/vim/snippets/php-cake/fchk.snippet
deleted file mode 100755
index 5dedad3..0000000
--- a/vim/snippets/php-cake/fchk.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->checkbox(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/fcre.snippet b/vim/snippets/php-cake/fcre.snippet
deleted file mode 100755
index 05f0bc1..0000000
--- a/vim/snippets/php-cake/fcre.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->create(${1:name}') ?>
diff --git a/vim/snippets/php-cake/fend.snippet b/vim/snippets/php-cake/fend.snippet
deleted file mode 100755
index 92f3d35..0000000
--- a/vim/snippets/php-cake/fend.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->end(${2:'${3:SubmitButtonValue}'}) ?>
diff --git a/vim/snippets/php-cake/ferr.snippet b/vim/snippets/php-cake/ferr.snippet
deleted file mode 100755
index d241a4d..0000000
--- a/vim/snippets/php-cake/ferr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->error(${1:'$2'}, ${3:'$4'}) ?>
diff --git a/vim/snippets/php-cake/ffil.snippet b/vim/snippets/php-cake/ffil.snippet
deleted file mode 100755
index 83e8890..0000000
--- a/vim/snippets/php-cake/ffil.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->file(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/fhid.snippet b/vim/snippets/php-cake/fhid.snippet
deleted file mode 100755
index 241360a..0000000
--- a/vim/snippets/php-cake/fhid.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->hidden(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/finp.snippet b/vim/snippets/php-cake/finp.snippet
deleted file mode 100755
index 0b0b90d..0000000
--- a/vim/snippets/php-cake/finp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->input(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/flbl.snippet b/vim/snippets/php-cake/flbl.snippet
deleted file mode 100755
index a1ea3fb..0000000
--- a/vim/snippets/php-cake/flbl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->label(${1:'${2:fieldName}'}, ${3:'${4:labelText}'}) ?>
diff --git a/vim/snippets/php-cake/fpwd.snippet b/vim/snippets/php-cake/fpwd.snippet
deleted file mode 100755
index 716b3e3..0000000
--- a/vim/snippets/php-cake/fpwd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->password(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/frad.snippet b/vim/snippets/php-cake/frad.snippet
deleted file mode 100755
index ab9a9ac..0000000
--- a/vim/snippets/php-cake/frad.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->radio(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/fsel.snippet b/vim/snippets/php-cake/fsel.snippet
deleted file mode 100755
index b363719..0000000
--- a/vim/snippets/php-cake/fsel.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->select(${1:'${2:name}'}, ${3:$options}, ${4:$selected}, ${5:$attributes}, ${6:$showEmpty}) ?>
diff --git a/vim/snippets/php-cake/fsub.snippet b/vim/snippets/php-cake/fsub.snippet
deleted file mode 100755
index 289d32a..0000000
--- a/vim/snippets/php-cake/fsub.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->submit(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/fsubimg.snippet b/vim/snippets/php-cake/fsubimg.snippet
deleted file mode 100755
index 3be4490..0000000
--- a/vim/snippets/php-cake/fsubimg.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->submitImage(${1:$path}) ?>
diff --git a/vim/snippets/php-cake/ftarea.snippet b/vim/snippets/php-cake/ftarea.snippet
deleted file mode 100755
index f61b7a6..0000000
--- a/vim/snippets/php-cake/ftarea.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->textarea(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/ftxt.snippet b/vim/snippets/php-cake/ftxt.snippet
deleted file mode 100755
index 5eda1d7..0000000
--- a/vim/snippets/php-cake/ftxt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $form->text(${1:'${2:name}'}) ?>
diff --git a/vim/snippets/php-cake/getc.snippet b/vim/snippets/php-cake/getc.snippet
deleted file mode 100755
index d76cbda..0000000
--- a/vim/snippets/php-cake/getc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->getCrumbs(${1:'${2:«separator»}'}) ?>
diff --git a/vim/snippets/php-cake/habtm.snippet b/vim/snippets/php-cake/habtm.snippet
deleted file mode 100755
index 1c1f059..0000000
--- a/vim/snippets/php-cake/habtm.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-var $hasAndBelongsToMany = array(
-	'${1:Model}'${2: => array(${3:'className' => '${4:${1:ModelClassName}}',}${5:'foreignKey' => '${6:foreign_key_field}'})}
-);
diff --git a/vim/snippets/php-cake/hm.snippet b/vim/snippets/php-cake/hm.snippet
deleted file mode 100755
index 8a94f52..0000000
--- a/vim/snippets/php-cake/hm.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-var $hasMany = array(
-	'${1:Model}'${2: => array(${3:'className' => '${4:${1:ModelClassName}}',}${5:'foreignKey' => '${6:foreign_key_field}'})}
-);
diff --git a/vim/snippets/php-cake/ho.snippet b/vim/snippets/php-cake/ho.snippet
deleted file mode 100755
index b2c8817..0000000
--- a/vim/snippets/php-cake/ho.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-var $hasOne = array(
-	'${1:Model}'${2: => array(${3:'className' => '${4:${1:ModelClassName}}',}${5:'foreignKey' => '${6:foreign_key_field}'})}
-);
diff --git a/vim/snippets/php-cake/imp.snippet b/vim/snippets/php-cake/imp.snippet
deleted file mode 100755
index 9668e53..0000000
--- a/vim/snippets/php-cake/imp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-App::import('${1:Core}', '${2:ClassName}');
diff --git a/vim/snippets/php-cake/inflector/camelize.snippet b/vim/snippets/php-cake/inflector/camelize.snippet
deleted file mode 100755
index b38fc7b..0000000
--- a/vim/snippets/php-cake/inflector/camelize.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::camelize(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/classify.snippet b/vim/snippets/php-cake/inflector/classify.snippet
deleted file mode 100755
index d82a393..0000000
--- a/vim/snippets/php-cake/inflector/classify.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::classify(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/humanize.snippet b/vim/snippets/php-cake/inflector/humanize.snippet
deleted file mode 100755
index edecd12..0000000
--- a/vim/snippets/php-cake/inflector/humanize.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::humanize(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/pluralize.snippet b/vim/snippets/php-cake/inflector/pluralize.snippet
deleted file mode 100755
index 255bbba..0000000
--- a/vim/snippets/php-cake/inflector/pluralize.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::pluralize(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/singularize.snippet b/vim/snippets/php-cake/inflector/singularize.snippet
deleted file mode 100755
index 0cf3100..0000000
--- a/vim/snippets/php-cake/inflector/singularize.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::singularize(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/slug.snippet b/vim/snippets/php-cake/inflector/slug.snippet
deleted file mode 100755
index 1cf7124..0000000
--- a/vim/snippets/php-cake/inflector/slug.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::slug(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/tabelize.snippet b/vim/snippets/php-cake/inflector/tabelize.snippet
deleted file mode 100755
index b3dd469..0000000
--- a/vim/snippets/php-cake/inflector/tabelize.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::tabelize(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/underscore.snippet b/vim/snippets/php-cake/inflector/underscore.snippet
deleted file mode 100755
index ab06858..0000000
--- a/vim/snippets/php-cake/inflector/underscore.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::underscore(${1:$word})
diff --git a/vim/snippets/php-cake/inflector/variable.snippet b/vim/snippets/php-cake/inflector/variable.snippet
deleted file mode 100755
index 5bbe8ea..0000000
--- a/vim/snippets/php-cake/inflector/variable.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Inflector::variable(${1:$word})
diff --git a/vim/snippets/php-cake/lay.snippet b/vim/snippets/php-cake/lay.snippet
deleted file mode 100755
index f7ccee7..0000000
--- a/vim/snippets/php-cake/lay.snippet
+++ /dev/null
@@ -1 +0,0 @@
-var $layout = ${1:'${2}'};
diff --git a/vim/snippets/php-cake/lay=.snippet b/vim/snippets/php-cake/lay=.snippet
deleted file mode 100755
index f2300cd..0000000
--- a/vim/snippets/php-cake/lay=.snippet
+++ /dev/null
@@ -1 +0,0 @@
-var $layout = ${1:}'${2:layout_name}';
diff --git a/vim/snippets/php-cake/lia.snippet b/vim/snippets/php-cake/lia.snippet
deleted file mode 100755
index f6288f7..0000000
--- a/vim/snippets/php-cake/lia.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->link('${1:Link Title}', array('action' => '${2:action_name}')) ?>
diff --git a/vim/snippets/php-cake/lic.snippet b/vim/snippets/php-cake/lic.snippet
deleted file mode 100755
index fb41512..0000000
--- a/vim/snippets/php-cake/lic.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->link('${1:Link Title}', array('controller' => '${2:controller_name}')) ?>
diff --git a/vim/snippets/php-cake/lica.snippet b/vim/snippets/php-cake/lica.snippet
deleted file mode 100755
index b990f1f..0000000
--- a/vim/snippets/php-cake/lica.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->link('${1:Link Title}', array('controller' => '${2:controller_name}', 'action' => '${3:action_name}')) ?>
diff --git a/vim/snippets/php-cake/lin.snippet b/vim/snippets/php-cake/lin.snippet
deleted file mode 100755
index 67c9314..0000000
--- a/vim/snippets/php-cake/lin.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->link('${1:Link Title}', '${2:/controller/action}') ?>
diff --git a/vim/snippets/php-cake/matom.snippet b/vim/snippets/php-cake/matom.snippet
deleted file mode 100755
index 1b87b52..0000000
--- a/vim/snippets/php-cake/matom.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->meta('atom', ${1:$this->webroot('${2:atom.xml}')}) ?>
diff --git a/vim/snippets/php-cake/mdel.snippet b/vim/snippets/php-cake/mdel.snippet
deleted file mode 100755
index ed77485..0000000
--- a/vim/snippets/php-cake/mdel.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->del(${2:$id}${3:, ${4: $cascade}})
diff --git a/vim/snippets/php-cake/mdesc.snippet b/vim/snippets/php-cake/mdesc.snippet
deleted file mode 100755
index 57f6317..0000000
--- a/vim/snippets/php-cake/mdesc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->meta('description', ${1:'${2:your description here}'}) ?>
diff --git a/vim/snippets/php-cake/mfind.snippet b/vim/snippets/php-cake/mfind.snippet
deleted file mode 100755
index 656563d..0000000
--- a/vim/snippets/php-cake/mfind.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find(${2:...})
diff --git a/vim/snippets/php-cake/mfinda.snippet b/vim/snippets/php-cake/mfinda.snippet
deleted file mode 100755
index 2a45972..0000000
--- a/vim/snippets/php-cake/mfinda.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find('all', ${2:...})
diff --git a/vim/snippets/php-cake/mfindb.snippet b/vim/snippets/php-cake/mfindb.snippet
deleted file mode 100755
index 9467123..0000000
--- a/vim/snippets/php-cake/mfindb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->findBy${2:ColumnName}(${3:...})
diff --git a/vim/snippets/php-cake/mfindc.snippet b/vim/snippets/php-cake/mfindc.snippet
deleted file mode 100755
index 6eb2e8b..0000000
--- a/vim/snippets/php-cake/mfindc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find('count', ${2:...})
diff --git a/vim/snippets/php-cake/mfindf.snippet b/vim/snippets/php-cake/mfindf.snippet
deleted file mode 100755
index 42a9f14..0000000
--- a/vim/snippets/php-cake/mfindf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find('first', ${2:...})
diff --git a/vim/snippets/php-cake/mfindl.snippet b/vim/snippets/php-cake/mfindl.snippet
deleted file mode 100755
index 21dbdcf..0000000
--- a/vim/snippets/php-cake/mfindl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find('list', ${2:...})
diff --git a/vim/snippets/php-cake/mfindn.snippet b/vim/snippets/php-cake/mfindn.snippet
deleted file mode 100755
index 1872a23..0000000
--- a/vim/snippets/php-cake/mfindn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find('neighbors', ${2:...})
diff --git a/vim/snippets/php-cake/mfindt.snippet b/vim/snippets/php-cake/mfindt.snippet
deleted file mode 100755
index 0b62412..0000000
--- a/vim/snippets/php-cake/mfindt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->find('threaded', ${2:...})
diff --git a/vim/snippets/php-cake/micon.snippet b/vim/snippets/php-cake/micon.snippet
deleted file mode 100755
index 658c2e4..0000000
--- a/vim/snippets/php-cake/micon.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->meta('icon', ${1:$this->webroot('${2:favicon.ico}')}) ?>
diff --git a/vim/snippets/php-cake/mid.snippet b/vim/snippets/php-cake/mid.snippet
deleted file mode 100755
index bdfe461..0000000
--- a/vim/snippets/php-cake/mid.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->id = ${2:$id};
diff --git a/vim/snippets/php-cake/mifsave.snippet b/vim/snippets/php-cake/mifsave.snippet
deleted file mode 100755
index e6e66ff..0000000
--- a/vim/snippets/php-cake/mifsave.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-if ($this->${1:Model}->save(${2:$this->data})) {
-	$3
-} else {
-	$4
-};
diff --git a/vim/snippets/php-cake/mkeyw.snippet b/vim/snippets/php-cake/mkeyw.snippet
deleted file mode 100755
index 73e22fb..0000000
--- a/vim/snippets/php-cake/mkeyw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->meta('keywords', ${1:'${2:your, keywords, here}'}) ?>
diff --git a/vim/snippets/php-cake/mrem.snippet b/vim/snippets/php-cake/mrem.snippet
deleted file mode 100755
index ecc7de6..0000000
--- a/vim/snippets/php-cake/mrem.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->remove(${2:$id}${3:, ${4: $cascade})
diff --git a/vim/snippets/php-cake/mrss.snippet b/vim/snippets/php-cake/mrss.snippet
deleted file mode 100755
index 44809bd..0000000
--- a/vim/snippets/php-cake/mrss.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $html->meta('rss', ${1:$this->webroot('${2:feed.rss}')}) ?>
diff --git a/vim/snippets/php-cake/msave.snippet b/vim/snippets/php-cake/msave.snippet
deleted file mode 100755
index c7f506b..0000000
--- a/vim/snippets/php-cake/msave.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->save(${2:$this->data})
diff --git a/vim/snippets/php-cake/msavef.snippet b/vim/snippets/php-cake/msavef.snippet
deleted file mode 100755
index 3d95af5..0000000
--- a/vim/snippets/php-cake/msavef.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->saveField(${2:'$3'}, ${4:$fieldValue})
diff --git a/vim/snippets/php-cake/mupa.snippet b/vim/snippets/php-cake/mupa.snippet
deleted file mode 100755
index 448e4a6..0000000
--- a/vim/snippets/php-cake/mupa.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:Model}->updateAll(${2:$fields}${3:, ${4: $conditions}})
diff --git a/vim/snippets/php-cake/newbeh.snippet b/vim/snippets/php-cake/newbeh.snippet
deleted file mode 100755
index 5dbae0a..0000000
--- a/vim/snippets/php-cake/newbeh.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:My}Behavior extends ModelBehavior {
-	${2:// My Code ...}
-};
diff --git a/vim/snippets/php-cake/newcom.snippet b/vim/snippets/php-cake/newcom.snippet
deleted file mode 100755
index c356754..0000000
--- a/vim/snippets/php-cake/newcom.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-class ${1:My}Component extends Object {
-	${2:var $controller;}
-	${3}
-};
diff --git a/vim/snippets/php-cake/newcon.snippet b/vim/snippets/php-cake/newcon.snippet
deleted file mode 100755
index df207d6..0000000
--- a/vim/snippets/php-cake/newcon.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:My}Controller extends AppController {
-	${2:// My Code ...}
-};
diff --git a/vim/snippets/php-cake/newhel.snippet b/vim/snippets/php-cake/newhel.snippet
deleted file mode 100755
index 7096a00..0000000
--- a/vim/snippets/php-cake/newhel.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:My}Helper extends AppHelper {
-	${2:// My Code ...}
-};
diff --git a/vim/snippets/php-cake/newmod.snippet b/vim/snippets/php-cake/newmod.snippet
deleted file mode 100755
index 4b167fe..0000000
--- a/vim/snippets/php-cake/newmod.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:My}Model extends AppModel {
-	${2:// My Code ...}
-};
diff --git a/vim/snippets/php-cake/onerr.snippet b/vim/snippets/php-cake/onerr.snippet
deleted file mode 100755
index aca7d1b..0000000
--- a/vim/snippets/php-cake/onerr.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function onError() {
-	${1}
-};
diff --git a/vim/snippets/php-cake/par.snippet b/vim/snippets/php-cake/par.snippet
deleted file mode 100755
index 7c12d87..0000000
--- a/vim/snippets/php-cake/par.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->params['${1:...}']
diff --git a/vim/snippets/php-cake/pr.snippet b/vim/snippets/php-cake/pr.snippet
deleted file mode 100755
index f1f67f4..0000000
--- a/vim/snippets/php-cake/pr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-pr(${1:$var});
diff --git a/vim/snippets/php-cake/pt=.snippet b/vim/snippets/php-cake/pt=.snippet
deleted file mode 100755
index de0ac14..0000000
--- a/vim/snippets/php-cake/pt=.snippet
+++ /dev/null
@@ -1 +0,0 @@
-var $this->pageTitle = ${1:'${2:Page Title}'};
diff --git a/vim/snippets/php-cake/ran.snippet b/vim/snippets/php-cake/ran.snippet
deleted file mode 100755
index b00a865..0000000
--- a/vim/snippets/php-cake/ran.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'alphaNumeric'
diff --git a/vim/snippets/php-cake/rbe.snippet b/vim/snippets/php-cake/rbe.snippet
deleted file mode 100755
index ff5ebac..0000000
--- a/vim/snippets/php-cake/rbe.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('between', ${1:min}, ${2:max})
diff --git a/vim/snippets/php-cake/rbl.snippet b/vim/snippets/php-cake/rbl.snippet
deleted file mode 100755
index d05c705..0000000
--- a/vim/snippets/php-cake/rbl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'blank'
diff --git a/vim/snippets/php-cake/rbo.snippet b/vim/snippets/php-cake/rbo.snippet
deleted file mode 100755
index ca951a3..0000000
--- a/vim/snippets/php-cake/rbo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'boolean'
diff --git a/vim/snippets/php-cake/rcc.snippet b/vim/snippets/php-cake/rcc.snippet
deleted file mode 100755
index 2fb321d..0000000
--- a/vim/snippets/php-cake/rcc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('cc', '${1:visa}')
diff --git a/vim/snippets/php-cake/rco.snippet b/vim/snippets/php-cake/rco.snippet
deleted file mode 100755
index ce97c7d..0000000
--- a/vim/snippets/php-cake/rco.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('comparison', '${1:an operator}'${2:, '{3:a second value}'})
diff --git a/vim/snippets/php-cake/rcu.snippet b/vim/snippets/php-cake/rcu.snippet
deleted file mode 100755
index 0ef9070..0000000
--- a/vim/snippets/php-cake/rcu.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('custom', '${1:regular expression}')
diff --git a/vim/snippets/php-cake/rda.snippet b/vim/snippets/php-cake/rda.snippet
deleted file mode 100755
index bed6ed8..0000000
--- a/vim/snippets/php-cake/rda.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('date', '${1:Ymd}')
diff --git a/vim/snippets/php-cake/rde.snippet b/vim/snippets/php-cake/rde.snippet
deleted file mode 100755
index c6a4037..0000000
--- a/vim/snippets/php-cake/rde.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'decimal'
diff --git a/vim/snippets/php-cake/rea.snippet b/vim/snippets/php-cake/rea.snippet
deleted file mode 100755
index 17408f2..0000000
--- a/vim/snippets/php-cake/rea.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->redirect(array('action' => '${1:action_name}'));
diff --git a/vim/snippets/php-cake/rec.snippet b/vim/snippets/php-cake/rec.snippet
deleted file mode 100755
index 61cabeb..0000000
--- a/vim/snippets/php-cake/rec.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->redirect(array('controller' => '${1:controller_name}'));
diff --git a/vim/snippets/php-cake/reca.snippet b/vim/snippets/php-cake/reca.snippet
deleted file mode 100755
index e9cc2a2..0000000
--- a/vim/snippets/php-cake/reca.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->redirect(array('controller' => '${1:controller_name}', 'action' => '${2:action_name}'));
diff --git a/vim/snippets/php-cake/redir.snippet b/vim/snippets/php-cake/redir.snippet
deleted file mode 100755
index 78afc12..0000000
--- a/vim/snippets/php-cake/redir.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->redirect('${1:/controller/action}');
diff --git a/vim/snippets/php-cake/rem.snippet b/vim/snippets/php-cake/rem.snippet
deleted file mode 100755
index 7760730..0000000
--- a/vim/snippets/php-cake/rem.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'email'
diff --git a/vim/snippets/php-cake/ren.snippet b/vim/snippets/php-cake/ren.snippet
deleted file mode 100755
index 64a586e..0000000
--- a/vim/snippets/php-cake/ren.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $this->renderElement('${1:path/to/element}') ?>
diff --git a/vim/snippets/php-cake/req.snippet b/vim/snippets/php-cake/req.snippet
deleted file mode 100755
index 35d1247..0000000
--- a/vim/snippets/php-cake/req.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('equalTo', '${1:another value}')
diff --git a/vim/snippets/php-cake/rex.snippet b/vim/snippets/php-cake/rex.snippet
deleted file mode 100755
index e44e035..0000000
--- a/vim/snippets/php-cake/rex.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('extension', array('${1:jpg}'${2:, '${3:gif}'}))
diff --git a/vim/snippets/php-cake/rfi.snippet b/vim/snippets/php-cake/rfi.snippet
deleted file mode 100755
index 0580ed1..0000000
--- a/vim/snippets/php-cake/rfi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'file'
diff --git a/vim/snippets/php-cake/rin.snippet b/vim/snippets/php-cake/rin.snippet
deleted file mode 100755
index a0ffbae..0000000
--- a/vim/snippets/php-cake/rin.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('inList', array(${1:List Items}))
diff --git a/vim/snippets/php-cake/rip.snippet b/vim/snippets/php-cake/rip.snippet
deleted file mode 100755
index 8383d4d..0000000
--- a/vim/snippets/php-cake/rip.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'ip'
diff --git a/vim/snippets/php-cake/rma.snippet b/vim/snippets/php-cake/rma.snippet
deleted file mode 100755
index 155a9f8..0000000
--- a/vim/snippets/php-cake/rma.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('maxLength', ${1:length})
diff --git a/vim/snippets/php-cake/rmi.snippet b/vim/snippets/php-cake/rmi.snippet
deleted file mode 100755
index 47e97fe..0000000
--- a/vim/snippets/php-cake/rmi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('minLength', ${1:length})
diff --git a/vim/snippets/php-cake/rmo.snippet b/vim/snippets/php-cake/rmo.snippet
deleted file mode 100755
index d07b7e4..0000000
--- a/vim/snippets/php-cake/rmo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'money'
diff --git a/vim/snippets/php-cake/rmu.snippet b/vim/snippets/php-cake/rmu.snippet
deleted file mode 100755
index 80e8b6a..0000000
--- a/vim/snippets/php-cake/rmu.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('multiple', ${1:type})
diff --git a/vim/snippets/php-cake/rnu.snippet b/vim/snippets/php-cake/rnu.snippet
deleted file mode 100755
index 2736925..0000000
--- a/vim/snippets/php-cake/rnu.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'numeric'
diff --git a/vim/snippets/php-cake/rph.snippet b/vim/snippets/php-cake/rph.snippet
deleted file mode 100755
index e77bc19..0000000
--- a/vim/snippets/php-cake/rph.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'phone'
diff --git a/vim/snippets/php-cake/rpo.snippet b/vim/snippets/php-cake/rpo.snippet
deleted file mode 100755
index 4d5b71e..0000000
--- a/vim/snippets/php-cake/rpo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'postal'
diff --git a/vim/snippets/php-cake/rra.snippet b/vim/snippets/php-cake/rra.snippet
deleted file mode 100755
index 3f8b940..0000000
--- a/vim/snippets/php-cake/rra.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => array('range', ${1:lower}, ${2:upper})
diff --git a/vim/snippets/php-cake/rssn.snippet b/vim/snippets/php-cake/rssn.snippet
deleted file mode 100755
index 959d022..0000000
--- a/vim/snippets/php-cake/rssn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'ssn'
diff --git a/vim/snippets/php-cake/rti.snippet b/vim/snippets/php-cake/rti.snippet
deleted file mode 100755
index f7576b3..0000000
--- a/vim/snippets/php-cake/rti.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'time'
diff --git a/vim/snippets/php-cake/rur.snippet b/vim/snippets/php-cake/rur.snippet
deleted file mode 100755
index 1e4fcb1..0000000
--- a/vim/snippets/php-cake/rur.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'rule' => 'url'
diff --git a/vim/snippets/php-cake/scaerr.snippet b/vim/snippets/php-cake/scaerr.snippet
deleted file mode 100755
index eb42e7b..0000000
--- a/vim/snippets/php-cake/scaerr.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-function _ScaffoldError($method) {
-	${1}
-	return false;
-};
diff --git a/vim/snippets/php-cake/scf.snippet b/vim/snippets/php-cake/scf.snippet
deleted file mode 100755
index 669ea85..0000000
--- a/vim/snippets/php-cake/scf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->check('Message.flash')
diff --git a/vim/snippets/php-cake/see.snippet b/vim/snippets/php-cake/see.snippet
deleted file mode 100755
index bdd455f..0000000
--- a/vim/snippets/php-cake/see.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $session->error() ?>
diff --git a/vim/snippets/php-cake/sef.snippet b/vim/snippets/php-cake/sef.snippet
deleted file mode 100755
index 3c845e1..0000000
--- a/vim/snippets/php-cake/sef.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $session->flash(${1:'${2:keyName}'}) ?>
diff --git a/vim/snippets/php-cake/ser.snippet b/vim/snippets/php-cake/ser.snippet
deleted file mode 100755
index aa9023e..0000000
--- a/vim/snippets/php-cake/ser.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $session->read(${1:'${2:keyName}'}) ?>
diff --git a/vim/snippets/php-cake/set.snippet b/vim/snippets/php-cake/set.snippet
deleted file mode 100755
index 05fd3b1..0000000
--- a/vim/snippets/php-cake/set.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->set('${1:varName}', ${2:'${3:value}'});
diff --git a/vim/snippets/php-cake/sfl.snippet b/vim/snippets/php-cake/sfl.snippet
deleted file mode 100755
index ddf6e77..0000000
--- a/vim/snippets/php-cake/sfl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-echo $scripts_for_layout
diff --git a/vim/snippets/php-cake/ssc.snippet b/vim/snippets/php-cake/ssc.snippet
deleted file mode 100755
index 7d35cde..0000000
--- a/vim/snippets/php-cake/ssc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->check(${1:'${2:key_name}'})
diff --git a/vim/snippets/php-cake/ssd.snippet b/vim/snippets/php-cake/ssd.snippet
deleted file mode 100755
index a203471..0000000
--- a/vim/snippets/php-cake/ssd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->del(${1:'${2:key_name}'})
diff --git a/vim/snippets/php-cake/ssde.snippet b/vim/snippets/php-cake/ssde.snippet
deleted file mode 100755
index 48f7785..0000000
--- a/vim/snippets/php-cake/ssde.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->destroy()
diff --git a/vim/snippets/php-cake/sse.snippet b/vim/snippets/php-cake/sse.snippet
deleted file mode 100755
index af3ab27..0000000
--- a/vim/snippets/php-cake/sse.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->error()
diff --git a/vim/snippets/php-cake/ssf.snippet b/vim/snippets/php-cake/ssf.snippet
deleted file mode 100755
index 94190da..0000000
--- a/vim/snippets/php-cake/ssf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->setFlash(${1:'${2:Message Text}'})
diff --git a/vim/snippets/php-cake/ssr.snippet b/vim/snippets/php-cake/ssr.snippet
deleted file mode 100755
index cc2fab2..0000000
--- a/vim/snippets/php-cake/ssr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->read(${1:'${2:key_name}'})
diff --git a/vim/snippets/php-cake/ssw.snippet b/vim/snippets/php-cake/ssw.snippet
deleted file mode 100755
index 2b797f8..0000000
--- a/vim/snippets/php-cake/ssw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->Session->write(${1:'${2:key_name}'}, ${3:$value})
diff --git a/vim/snippets/php-cake/tfl.snippet b/vim/snippets/php-cake/tfl.snippet
deleted file mode 100755
index 92e55ca..0000000
--- a/vim/snippets/php-cake/tfl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-echo $title_for_layout
diff --git a/vim/snippets/php-cake/use.snippet b/vim/snippets/php-cake/use.snippet
deleted file mode 100755
index 2f80557..0000000
--- a/vim/snippets/php-cake/use.snippet
+++ /dev/null
@@ -1 +0,0 @@
-var $useTable = ${1:'${2:table_name}'};
diff --git a/vim/snippets/php-cake/val.snippet b/vim/snippets/php-cake/val.snippet
deleted file mode 100755
index 5708e75..0000000
--- a/vim/snippets/php-cake/val.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-var $validate = array(
-	'${1:fieldName}' => array(
-		'${2:ruleName}' => array(
-			'rule' => '${3:rule}',
-			'allowEmpty' => false,
-			'message' => '${4:message}'
-		)
-	)
-);
diff --git a/vim/snippets/php-cake/vcfl.snippet b/vim/snippets/php-cake/vcfl.snippet
deleted file mode 100755
index 5375089..0000000
--- a/vim/snippets/php-cake/vcfl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $content_for_layout ?>
diff --git a/vim/snippets/php-cake/vsfl.snippet b/vim/snippets/php-cake/vsfl.snippet
deleted file mode 100755
index 3e36fbd..0000000
--- a/vim/snippets/php-cake/vsfl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $scripts_for_layout ?>
diff --git a/vim/snippets/php-cake/vtfl.snippet b/vim/snippets/php-cake/vtfl.snippet
deleted file mode 100755
index 26ce7a2..0000000
--- a/vim/snippets/php-cake/vtfl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $title_for_layout ?>
diff --git a/vim/snippets/php-zend/assert.snippet b/vim/snippets/php-zend/assert.snippet
deleted file mode 100755
index ca928f2..0000000
--- a/vim/snippets/php-zend/assert.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->assertTrue(${1:somevar}, '${2:sometext}');
diff --git a/vim/snippets/php-zend/boolcol.snippet b/vim/snippets/php-zend/boolcol.snippet
deleted file mode 100755
index 715fe19..0000000
--- a/vim/snippets/php-zend/boolcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->hasColumn('${1:active}', '${2:boolean}', ${3:1}, array('default' => '${4:1}','notnull' => true));
diff --git a/vim/snippets/php-zend/clac.snippet b/vim/snippets/php-zend/clac.snippet
deleted file mode 100755
index 80972a1..0000000
--- a/vim/snippets/php-zend/clac.snippet
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * $1Controller
- * @package       ${2}
- * @author        ${3:`g:snips_author`}
- * @copyright     (c) `strftime("%Y")`
- */
-class ${1:Index}Controller extends Application_Controller
-{
-	/**
-	 * indexAction
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function indexAction(){
-		${4:// some code}
-	}
-}
diff --git a/vim/snippets/php-zend/flash.snippet b/vim/snippets/php-zend/flash.snippet
deleted file mode 100755
index d382748..0000000
--- a/vim/snippets/php-zend/flash.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->_flashMessenger->addMessage("${1}", '${2:error}');
diff --git a/vim/snippets/php-zend/getconf.snippet b/vim/snippets/php-zend/getconf.snippet
deleted file mode 100755
index 10f2b20..0000000
--- a/vim/snippets/php-zend/getconf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:conf} = Zend_Registry::get('${2:config}')->${3:general};
diff --git a/vim/snippets/php-zend/input.snippet b/vim/snippets/php-zend/input.snippet
deleted file mode 100755
index 3c4ed27..0000000
--- a/vim/snippets/php-zend/input.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<?= $this->formInput(array( 'type' => '${1:hidden}',
-							'name' => '${2}',
-							'value' => ${3:},
-							'id' => '${4:}' )); ?>
diff --git a/vim/snippets/php-zend/inputarr.snippet b/vim/snippets/php-zend/inputarr.snippet
deleted file mode 100755
index 8e97bee..0000000
--- a/vim/snippets/php-zend/inputarr.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-<?= $this->formInput(array( 'type' => '${1:dropdown}',
-			    'name' => '${2}',
-			    'label' => '${3:}',
-			    'errors' => ${4:},
-			    'value' => ${5:},
-			    'valueList' => ${6:} )); ?>
diff --git a/vim/snippets/php-zend/intcol.snippet b/vim/snippets/php-zend/intcol.snippet
deleted file mode 100755
index caacaa6..0000000
--- a/vim/snippets/php-zend/intcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->hasColumn('${1:id}', '${2:integer}', ${3:11}, array(${4:'notnull' => true)});
diff --git a/vim/snippets/php-zend/lib.snippet b/vim/snippets/php-zend/lib.snippet
deleted file mode 100755
index 683e22e..0000000
--- a/vim/snippets/php-zend/lib.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Application_${1:Hellu}
-{${2}
-}
diff --git a/vim/snippets/php-zend/model.snippet b/vim/snippets/php-zend/model.snippet
deleted file mode 100755
index 0c267f5..0000000
--- a/vim/snippets/php-zend/model.snippet
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-class ${1:Model} extends Doctrine_Record implements Zend_Auth_Adapter_Interface, Zend_Acl_Role_Interface
-{
-	protected  $searchconditions = array();
-
-	/**
-	 * Enter description here...
-	 *
-	 * @var ${2:Model}
-	 */
-	protected static $_identity = null;
-
-	/**
-	 * Zend_Auth
-	 *
-	 * @var Zend_Auth
-	 */
-	protected static $_auth;
-
-
-	/**
-	 * Doctrine
-	 */
-	public function setTableDefinition()
-	{
-		$this->hasColumn('id', 'integer', 4, array('notnull' => true, 
-												   'primary' => true, 
-												   'autoincrement' => true));
-		${3}
-	}
-
-}
diff --git a/vim/snippets/php-zend/navi.snippet b/vim/snippets/php-zend/navi.snippet
deleted file mode 100755
index 2724ff9..0000000
--- a/vim/snippets/php-zend/navi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->view->navigationActive = array('topnavi' => '${1:home}','subnavi' => '${2:index}');
diff --git a/vim/snippets/php-zend/route.snippet b/vim/snippets/php-zend/route.snippet
deleted file mode 100755
index cdf834b..0000000
--- a/vim/snippets/php-zend/route.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->_redirector->gotoRoute(array('controller' => '${1}', 'action' => '${2:index}', 'id' => '${3:}'), '${4:admin_action}');
diff --git a/vim/snippets/php-zend/rp.snippet b/vim/snippets/php-zend/rp.snippet
deleted file mode 100755
index b5dcd1f..0000000
--- a/vim/snippets/php-zend/rp.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-<?=$this->partial('${1:somefile}.phtml',
-				  array(${2}))?>
diff --git a/vim/snippets/php-zend/strcol.snippet b/vim/snippets/php-zend/strcol.snippet
deleted file mode 100755
index 98d3cf3..0000000
--- a/vim/snippets/php-zend/strcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->hasColumn('${1:title}', '${2:string}', ${3:255}, array(${4:'notnull' => true}));
diff --git a/vim/snippets/php/$.snippet b/vim/snippets/php/$.snippet
deleted file mode 120000
index a3b0561..0000000
--- a/vim/snippets/php/$.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$m.snippet
\ No newline at end of file
diff --git a/vim/snippets/php/$a.snippet b/vim/snippets/php/$a.snippet
deleted file mode 100755
index 3989bac..0000000
--- a/vim/snippets/php/$a.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:name}->${2:method}${3}
diff --git a/vim/snippets/php/$m.snippet b/vim/snippets/php/$m.snippet
deleted file mode 100755
index 738af18..0000000
--- a/vim/snippets/php/$m.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:name}->${2:method}(${3:args})${4}
diff --git a/vim/snippets/php/a.snippet b/vim/snippets/php/a.snippet
deleted file mode 100755
index 10d7ef2..0000000
--- a/vim/snippets/php/a.snippet
+++ /dev/null
@@ -1 +0,0 @@
-->${1:attr}${2}
diff --git a/vim/snippets/php/ar.snippet b/vim/snippets/php/ar.snippet
deleted file mode 100755
index bdd58f4..0000000
--- a/vim/snippets/php/ar.snippet
+++ /dev/null
@@ -1 +0,0 @@
-array('${1}' => ${2});
diff --git a/vim/snippets/php/array.snippet b/vim/snippets/php/array.snippet
deleted file mode 100755
index 922542e..0000000
--- a/vim/snippets/php/array.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:arrayName} = array('${2}' => ${3});${4}
diff --git a/vim/snippets/php/case.snippet b/vim/snippets/php/case.snippet
deleted file mode 100755
index 8f9e4da..0000000
--- a/vim/snippets/php/case.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-case '${1:value}':
-	${2:// code...}
-	break;${3}
diff --git a/vim/snippets/php/class.snippet b/vim/snippets/php/class.snippet
deleted file mode 100755
index 28d7c0a..0000000
--- a/vim/snippets/php/class.snippet
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * ${1}
- */
-class ${2:ClassName}
-{
-	${3}
-	function ${4:__construct}(${5:$argument})
-	{
-		${6:// code...}
-	}
-}
diff --git a/vim/snippets/php/classe.snippet b/vim/snippets/php/classe.snippet
deleted file mode 100755
index 2f2b0bc..0000000
--- a/vim/snippets/php/classe.snippet
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * ${1}
- */
-class ${2:ClassName} extends ${3:AnotherClass}
-{
-	${4}
-	function ${5:__construct}(${6:argument})
-	{
-		${7:// code...}
-	}
-}
-
diff --git a/vim/snippets/php/def.snippet b/vim/snippets/php/def.snippet
deleted file mode 100755
index df0f5eb..0000000
--- a/vim/snippets/php/def.snippet
+++ /dev/null
@@ -1 +0,0 @@
-define('${1}'${2});${3}
diff --git a/vim/snippets/php/defd.snippet b/vim/snippets/php/defd.snippet
deleted file mode 100755
index 6758cda..0000000
--- a/vim/snippets/php/defd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1}defined('${2}')${3}
diff --git a/vim/snippets/php/do.snippet b/vim/snippets/php/do.snippet
deleted file mode 100755
index e7dd5b0..0000000
--- a/vim/snippets/php/do.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-do {
-	${2:// code... }
-} while (${1:/* condition */});"
diff --git a/vim/snippets/php/doc_cp.snippet b/vim/snippets/php/doc_cp.snippet
deleted file mode 100755
index d6d1b3f..0000000
--- a/vim/snippets/php/doc_cp.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * ${1:undocumented class}
- *
- * @package ${2:default}
- * @author ${3:`g:snips_author`}
- **/${4}
diff --git a/vim/snippets/php/doc_f.snippet b/vim/snippets/php/doc_f.snippet
deleted file mode 100755
index a9adbb0..0000000
--- a/vim/snippets/php/doc_f.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * $2
- * @return ${4:void}
- * @author ${5:`g:snips_author`}
- **/
-${1:public }function ${2:someFunc}(${3})
-{${6}
-}
diff --git a/vim/snippets/php/doc_h.snippet b/vim/snippets/php/doc_h.snippet
deleted file mode 100755
index a0c12e0..0000000
--- a/vim/snippets/php/doc_h.snippet
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * ${1}
- *
- * @author ${2:`g:snips_author`}
- * @version ${3:$Id$}
- * @copyright ${4:$2}, `strftime('%d %B, %Y')`
- * @package ${5:default}
- **/
-/**
- * Define DocBlock *//
diff --git a/vim/snippets/php/doc_i.snippet b/vim/snippets/php/doc_i.snippet
deleted file mode 100755
index e62eab7..0000000
--- a/vim/snippets/php/doc_i.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * $1
- * @package ${2:default}
- * @author ${3:`g:snips_author`}
- **/
-interface ${1:someClass}
-{${4}
-} // END interface $1"
diff --git a/vim/snippets/php/each.snippet b/vim/snippets/php/each.snippet
deleted file mode 120000
index 0c6ba66..0000000
--- a/vim/snippets/php/each.snippet
+++ /dev/null
@@ -1 +0,0 @@
-foreach.snippet
\ No newline at end of file
diff --git a/vim/snippets/php/eachk.snippet b/vim/snippets/php/eachk.snippet
deleted file mode 120000
index 82311a2..0000000
--- a/vim/snippets/php/eachk.snippet
+++ /dev/null
@@ -1 +0,0 @@
-foreachk.snippet
\ No newline at end of file
diff --git a/vim/snippets/php/ec.snippet b/vim/snippets/php/ec.snippet
deleted file mode 100755
index 489d759..0000000
--- a/vim/snippets/php/ec.snippet
+++ /dev/null
@@ -1 +0,0 @@
-echo "${1:string}"${2};
diff --git a/vim/snippets/php/else.snippet b/vim/snippets/php/else.snippet
deleted file mode 100755
index b910e98..0000000
--- a/vim/snippets/php/else.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-else {
-	${1:// code...}
-}
diff --git a/vim/snippets/php/elseif.snippet b/vim/snippets/php/elseif.snippet
deleted file mode 100755
index a57dec8..0000000
--- a/vim/snippets/php/elseif.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-elseif (${1:/* condition */}) {
-	${2:// code...}
-}
diff --git a/vim/snippets/php/for.snippet b/vim/snippets/php/for.snippet
deleted file mode 100755
index e9bc52a..0000000
--- a/vim/snippets/php/for.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
-	${4:// code...}
-}
diff --git a/vim/snippets/php/fore/key-value-template.snippet b/vim/snippets/php/fore/key-value-template.snippet
deleted file mode 100755
index 0c55992..0000000
--- a/vim/snippets/php/fore/key-value-template.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-  <?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
-    ${4}
-  <?php endforeach ?>
-  ${5}
diff --git a/vim/snippets/php/fore/key-value.snippet b/vim/snippets/php/fore/key-value.snippet
deleted file mode 100755
index e72c855..0000000
--- a/vim/snippets/php/fore/key-value.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-  foreach ($${1:variable} as $${2:key} => $${3:value}) {
-    ${4}
-  }
-
-  ${5}
diff --git a/vim/snippets/php/fore/value-template.snippet b/vim/snippets/php/fore/value-template.snippet
deleted file mode 100755
index c44b35c..0000000
--- a/vim/snippets/php/fore/value-template.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-  <?php foreach ($${1:variable} as $${2:value}): ?>
-    ${3}
-  <?php endforeach ?>
-  ${4}
diff --git a/vim/snippets/php/fore/value.snippet b/vim/snippets/php/fore/value.snippet
deleted file mode 100755
index 8756c95..0000000
--- a/vim/snippets/php/fore/value.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-  foreach ($${1:variable} as $${2:value}) {
-    ${3}
-  }
-
-  ${4}
diff --git a/vim/snippets/php/foreach.snippet b/vim/snippets/php/foreach.snippet
deleted file mode 100755
index dd40f21..0000000
--- a/vim/snippets/php/foreach.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-foreach ($${1:variable} as $${2:value}){
-	${3:// code...}
-}
diff --git a/vim/snippets/php/foreachk.snippet b/vim/snippets/php/foreachk.snippet
deleted file mode 100755
index f78d57a..0000000
--- a/vim/snippets/php/foreachk.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-foreach ($${1:variable} as $${2:key} => $${3:value}){
-	${4:// code...}
-}
diff --git a/vim/snippets/php/fun.snippet b/vim/snippets/php/fun.snippet
deleted file mode 100755
index 0f5d353..0000000
--- a/vim/snippets/php/fun.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-${1:public }function ${2:FunctionName}(${3})
-{
-	${4:// code...}
-}
diff --git a/vim/snippets/php/get.snippet b/vim/snippets/php/get.snippet
deleted file mode 100755
index af32e0a..0000000
--- a/vim/snippets/php/get.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$_GET['${1}']${2}
diff --git a/vim/snippets/php/globals.snippet b/vim/snippets/php/globals.snippet
deleted file mode 100755
index 6f5b04f..0000000
--- a/vim/snippets/php/globals.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$GLOBALS['${1:variable}']${2: = }${3:something}${4:;}${5}
diff --git a/vim/snippets/php/if.snippet b/vim/snippets/php/if.snippet
deleted file mode 100755
index 69ac0bd..0000000
--- a/vim/snippets/php/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if (${1:/* condition */}) {
-	${2:// code...}
-}
diff --git a/vim/snippets/php/ife.snippet b/vim/snippets/php/ife.snippet
deleted file mode 100755
index b8621c1..0000000
--- a/vim/snippets/php/ife.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-if (${1:/* condition */}) {
-	${2:// code...}
-} else {
-}
diff --git a/vim/snippets/php/inc.snippet b/vim/snippets/php/inc.snippet
deleted file mode 100755
index 8df3966..0000000
--- a/vim/snippets/php/inc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-include '${1:file}';${2}
diff --git a/vim/snippets/php/inc1.snippet b/vim/snippets/php/inc1.snippet
deleted file mode 100755
index ba26281..0000000
--- a/vim/snippets/php/inc1.snippet
+++ /dev/null
@@ -1 +0,0 @@
-include_once '${1:file}';${2}
diff --git a/vim/snippets/php/k.snippet b/vim/snippets/php/k.snippet
deleted file mode 100755
index cba4b29..0000000
--- a/vim/snippets/php/k.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'${1:key}' => ${2:value}
diff --git a/vim/snippets/php/ks.snippet b/vim/snippets/php/ks.snippet
deleted file mode 100755
index e1b5a7f..0000000
--- a/vim/snippets/php/ks.snippet
+++ /dev/null
@@ -1 +0,0 @@
-'${1:key}' => '${2:value}'
diff --git a/vim/snippets/php/log.snippet b/vim/snippets/php/log.snippet
deleted file mode 100755
index 2b8dcc4..0000000
--- a/vim/snippets/php/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-error_log(var_export(${1}, true));${2}
diff --git a/vim/snippets/php/m.snippet b/vim/snippets/php/m.snippet
deleted file mode 100755
index 87de4f4..0000000
--- a/vim/snippets/php/m.snippet
+++ /dev/null
@@ -1 +0,0 @@
-->${1:method}(${2:args})${3}
diff --git a/vim/snippets/php/php.snippet b/vim/snippets/php/php.snippet
deleted file mode 100755
index ed2ed1c..0000000
--- a/vim/snippets/php/php.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-${1}
-?>
diff --git a/vim/snippets/php/phpc.snippet b/vim/snippets/php/phpc.snippet
deleted file mode 100755
index 3be32e0..0000000
--- a/vim/snippets/php/phpc.snippet
+++ /dev/null
@@ -1 +0,0 @@
- ?> ${1}
diff --git a/vim/snippets/php/phpin.snippet b/vim/snippets/php/phpin.snippet
deleted file mode 100755
index b128e8d..0000000
--- a/vim/snippets/php/phpin.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php ${1} ?>
diff --git a/vim/snippets/php/phpo.snippet b/vim/snippets/php/phpo.snippet
deleted file mode 100755
index 6fd56c0..0000000
--- a/vim/snippets/php/phpo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<?php ${1}
diff --git a/vim/snippets/php/post.snippet b/vim/snippets/php/post.snippet
deleted file mode 100755
index 2de7aa5..0000000
--- a/vim/snippets/php/post.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$_POST['${1}']${2}
diff --git a/vim/snippets/php/req.snippet b/vim/snippets/php/req.snippet
deleted file mode 100755
index b8441a3..0000000
--- a/vim/snippets/php/req.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-require '${1:gem}'
-${2}
diff --git a/vim/snippets/php/req1.snippet b/vim/snippets/php/req1.snippet
deleted file mode 100755
index e909c3b..0000000
--- a/vim/snippets/php/req1.snippet
+++ /dev/null
@@ -1 +0,0 @@
-require_once '${1:file}';${2}
diff --git a/vim/snippets/php/request.snippet b/vim/snippets/php/request.snippet
deleted file mode 100755
index 9a839b1..0000000
--- a/vim/snippets/php/request.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$_REQUEST['${1}']${2}
diff --git a/vim/snippets/php/session.snippet b/vim/snippets/php/session.snippet
deleted file mode 100755
index 5e3e11b..0000000
--- a/vim/snippets/php/session.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$_SESSION['${1}']${2}
diff --git a/vim/snippets/php/sfun.snippet b/vim/snippets/php/sfun.snippet
deleted file mode 100755
index ec4b0d2..0000000
--- a/vim/snippets/php/sfun.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-${1:public }static function ${2:FunctionName}(${3})
-{
-	${4:// code...}
-}
diff --git a/vim/snippets/php/switch.snippet b/vim/snippets/php/switch.snippet
deleted file mode 100755
index 7fc47c6..0000000
--- a/vim/snippets/php/switch.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-switch ($${1:variable}) {
-	case '${2:value}':
-		${3:// code...}
-		break;
-	${5}
-	default:
-		${4:// code...}
-		break;
-}
diff --git a/vim/snippets/php/t.snippet b/vim/snippets/php/t.snippet
deleted file mode 100755
index e8deae5..0000000
--- a/vim/snippets/php/t.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};${5}
diff --git a/vim/snippets/php/ta.snippet b/vim/snippets/php/ta.snippet
deleted file mode 100755
index ee37b0e..0000000
--- a/vim/snippets/php/ta.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:attr}${2};
diff --git a/vim/snippets/php/throw.snippet b/vim/snippets/php/throw.snippet
deleted file mode 100755
index 54db517..0000000
--- a/vim/snippets/php/throw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-throw new ${1:Exception}('${2}');
diff --git a/vim/snippets/php/tm.snippet b/vim/snippets/php/tm.snippet
deleted file mode 100755
index 70049ef..0000000
--- a/vim/snippets/php/tm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->${1:method}(${2:args})${3};
diff --git a/vim/snippets/php/try.snippet b/vim/snippets/php/try.snippet
deleted file mode 100755
index 66a7f65..0000000
--- a/vim/snippets/php/try.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-try  {
-	${1:// code...}
-} catch (${2:Exception} $e) {
-	${3:// code...}
-}
-
diff --git a/vim/snippets/php/var.snippet b/vim/snippets/php/var.snippet
deleted file mode 100755
index 1f8cd08..0000000
--- a/vim/snippets/php/var.snippet
+++ /dev/null
@@ -1 +0,0 @@
-var_export(${1});${2}
diff --git a/vim/snippets/php/wh.snippet b/vim/snippets/php/wh.snippet
deleted file mode 100755
index 36ae0ff..0000000
--- a/vim/snippets/php/wh.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-while (${1:/* condition */}) {
-	${2:// code...}
-}
diff --git a/vim/snippets/php/while.snippet b/vim/snippets/php/while.snippet
deleted file mode 120000
index 8d3633c..0000000
--- a/vim/snippets/php/while.snippet
+++ /dev/null
@@ -1 +0,0 @@
-wh.snippet
\ No newline at end of file
diff --git a/vim/snippets/po/msg.snippet b/vim/snippets/po/msg.snippet
deleted file mode 100755
index 2ad6638..0000000
--- a/vim/snippets/po/msg.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-msgid "${1}"
-msgstr "${2}"${3}
diff --git a/vim/snippets/progress/alert.snippet b/vim/snippets/progress/alert.snippet
deleted file mode 100755
index 0700c15..0000000
--- a/vim/snippets/progress/alert.snippet
+++ /dev/null
@@ -1 +0,0 @@
-MESSAGE "${1:MessageContent}" ${2:Data} VIEW-AS ALERT-BOX.
diff --git a/vim/snippets/progress/char.snippet b/vim/snippets/progress/char.snippet
deleted file mode 100755
index a4913ba..0000000
--- a/vim/snippets/progress/char.snippet
+++ /dev/null
@@ -1 +0,0 @@
-CHARACTER
diff --git a/vim/snippets/progress/dec.snippet b/vim/snippets/progress/dec.snippet
deleted file mode 100755
index 923c4d6..0000000
--- a/vim/snippets/progress/dec.snippet
+++ /dev/null
@@ -1 +0,0 @@
-DECIMAL
diff --git a/vim/snippets/progress/defbuf.snippet b/vim/snippets/progress/defbuf.snippet
deleted file mode 100755
index 9cc4532..0000000
--- a/vim/snippets/progress/defbuf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-DEFINE VARIABLE ${1:VariableName} AS ${2}.DEFINE BUFFER b_${1:TableName} FOR $1 ${2}.
diff --git a/vim/snippets/progress/defvar.snippet b/vim/snippets/progress/defvar.snippet
deleted file mode 100755
index b476e4c..0000000
--- a/vim/snippets/progress/defvar.snippet
+++ /dev/null
@@ -1 +0,0 @@
-DEFINE VARIABLE ${1:VariableName} AS ${2}.
diff --git a/vim/snippets/progress/do.snippet b/vim/snippets/progress/do.snippet
deleted file mode 100755
index 30d4e88..0000000
--- a/vim/snippets/progress/do.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-DO${1: Clauses}:
-	${2}
-END.
diff --git a/vim/snippets/progress/err.snippet b/vim/snippets/progress/err.snippet
deleted file mode 100755
index 5df7507..0000000
--- a/vim/snippets/progress/err.snippet
+++ /dev/null
@@ -1 +0,0 @@
-ERROR
diff --git a/vim/snippets/progress/ff.snippet b/vim/snippets/progress/ff.snippet
deleted file mode 100755
index ab57090..0000000
--- a/vim/snippets/progress/ff.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-FIND FIRST ${1:BufferName}
-${2:WHERE $1.${3}} ${4}
diff --git a/vim/snippets/progress/if.snippet b/vim/snippets/progress/if.snippet
deleted file mode 100755
index 0cafabc..0000000
--- a/vim/snippets/progress/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-IF ${1:Condition}
-THEN ${2:Action}
-${3:ELSE ${4:OtherWise}}
diff --git a/vim/snippets/progress/ini.snippet b/vim/snippets/progress/ini.snippet
deleted file mode 100755
index 4ac993f..0000000
--- a/vim/snippets/progress/ini.snippet
+++ /dev/null
@@ -1 +0,0 @@
-INITIAL ${1:?}
diff --git a/vim/snippets/progress/input.snippet b/vim/snippets/progress/input.snippet
deleted file mode 100755
index 2f2417f..0000000
--- a/vim/snippets/progress/input.snippet
+++ /dev/null
@@ -1 +0,0 @@
-DEFINE INPUT PARAMETER ${1:ParamName} AS ${2}.
diff --git a/vim/snippets/progress/int.snippet b/vim/snippets/progress/int.snippet
deleted file mode 100755
index 97b327c..0000000
--- a/vim/snippets/progress/int.snippet
+++ /dev/null
@@ -1 +0,0 @@
-INTEGER
diff --git a/vim/snippets/progress/log.snippet b/vim/snippets/progress/log.snippet
deleted file mode 100755
index 6268694..0000000
--- a/vim/snippets/progress/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-LOGICAL
diff --git a/vim/snippets/progress/ne.snippet b/vim/snippets/progress/ne.snippet
deleted file mode 100755
index bf2cb1c..0000000
--- a/vim/snippets/progress/ne.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NO-ERROR
diff --git a/vim/snippets/progress/nl.snippet b/vim/snippets/progress/nl.snippet
deleted file mode 100755
index 11f6eee..0000000
--- a/vim/snippets/progress/nl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NO-LOCK
diff --git a/vim/snippets/progress/nle.snippet b/vim/snippets/progress/nle.snippet
deleted file mode 100755
index 1138325..0000000
--- a/vim/snippets/progress/nle.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NO-LOCK NO-ERROR
diff --git a/vim/snippets/progress/nu.snippet b/vim/snippets/progress/nu.snippet
deleted file mode 100755
index 57b8f70..0000000
--- a/vim/snippets/progress/nu.snippet
+++ /dev/null
@@ -1 +0,0 @@
-NO-UNDO
diff --git a/vim/snippets/progress/output.snippet b/vim/snippets/progress/output.snippet
deleted file mode 100755
index 1555cd8..0000000
--- a/vim/snippets/progress/output.snippet
+++ /dev/null
@@ -1 +0,0 @@
-DEFINE OUTPUT PARAMETER ${1:ParamName} AS ${2:ParamType}.
diff --git a/vim/snippets/progress/proc.snippet b/vim/snippets/progress/proc.snippet
deleted file mode 100755
index 1e4d799..0000000
--- a/vim/snippets/progress/proc.snippet
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	/******************************************************************************/
-
-	PROCEDURE ${1:ProcName}:
-
-		${2}
-
-	END PROCEDURE. /* $1 */
-
-	/******************************************************************************/
-
diff --git a/vim/snippets/progress/sep.snippet b/vim/snippets/progress/sep.snippet
deleted file mode 100755
index a2cf2e8..0000000
--- a/vim/snippets/progress/sep.snippet
+++ /dev/null
@@ -1 +0,0 @@
-/* ------------------------------------------------------------------------- */ 
diff --git a/vim/snippets/python/#!.snippet b/vim/snippets/python/#!.snippet
deleted file mode 100755
index e4ad972..0000000
--- a/vim/snippets/python/#!.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env python
-# −*− coding: UTF−8 −*−
diff --git a/vim/snippets/python/class.snippet b/vim/snippets/python/class.snippet
deleted file mode 100755
index d9e2b8e..0000000
--- a/vim/snippets/python/class.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-class ${1:``Snippet_PythonClassNameFromFilename()``}(${2:data}):
-${3}
diff --git a/vim/snippets/python/class/basic.snippet b/vim/snippets/python/class/basic.snippet
deleted file mode 100755
index 2f2834a..0000000
--- a/vim/snippets/python/class/basic.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-class ${1:`Snippet_PythonClassNameFromFilename()`}(${2:data}):
-	${3}
diff --git a/vim/snippets/python/class/exception.snippet b/vim/snippets/python/class/exception.snippet
deleted file mode 100755
index ece777b..0000000
--- a/vim/snippets/python/class/exception.snippet
+++ /dev/null
@@ -1 +0,0 @@
-class ${1:ExceptionName}(${2:Exception}): pass
diff --git a/vim/snippets/python/class/with_init.snippet b/vim/snippets/python/class/with_init.snippet
deleted file mode 100755
index db6bc25..0000000
--- a/vim/snippets/python/class/with_init.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:`Snippet_PythonClassNameFromFilename()`}(${2:data}):
-	def __init__(self, ${3:args}):
-		${4}
diff --git a/vim/snippets/python/def.snippet b/vim/snippets/python/def.snippet
deleted file mode 100755
index 71a884c..0000000
--- a/vim/snippets/python/def.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-def ${1:name}(${2:data}):
-	${3}
diff --git a/vim/snippets/python/for.snippet b/vim/snippets/python/for.snippet
deleted file mode 100755
index d0772ec..0000000
--- a/vim/snippets/python/for.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-for ${1:var} in ${2:type}:
-	${3:pass}
diff --git a/vim/snippets/python/from.snippet b/vim/snippets/python/from.snippet
deleted file mode 100755
index 5fa504c..0000000
--- a/vim/snippets/python/from.snippet
+++ /dev/null
@@ -1 +0,0 @@
-from ${1:module} import ${2:name}
diff --git a/vim/snippets/python/get.snippet b/vim/snippets/python/get.snippet
deleted file mode 100755
index f6a279b..0000000
--- a/vim/snippets/python/get.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-def get_${1:name}(self):
-	return self._$1
diff --git a/vim/snippets/python/if.snippet b/vim/snippets/python/if.snippet
deleted file mode 100755
index cfa7605..0000000
--- a/vim/snippets/python/if.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-if (${1:condition}):
-	${2}
diff --git a/vim/snippets/python/ife.snippet b/vim/snippets/python/ife.snippet
deleted file mode 100755
index 5ce0795..0000000
--- a/vim/snippets/python/ife.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-if (${1:condition}):
-	${2}
-else:
-	${3}
diff --git a/vim/snippets/python/ifmain.snippet b/vim/snippets/python/ifmain.snippet
deleted file mode 100755
index 8051c3b..0000000
--- a/vim/snippets/python/ifmain.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-if __name__ == '__main__':
-	${1}
diff --git a/vim/snippets/python/import.snippet b/vim/snippets/python/import.snippet
deleted file mode 100755
index 74b2d79..0000000
--- a/vim/snippets/python/import.snippet
+++ /dev/null
@@ -1 +0,0 @@
-import ${1:module}
diff --git a/vim/snippets/python/init.snippet b/vim/snippets/python/init.snippet
deleted file mode 100755
index a8a004b..0000000
--- a/vim/snippets/python/init.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-def __init__(self, ${1:args}):
-	${2}
diff --git a/vim/snippets/python/set.snippet b/vim/snippets/python/set.snippet
deleted file mode 100755
index 3cf6286..0000000
--- a/vim/snippets/python/set.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-def set_${1:name}(self, ${2:value}):
-	${3}
diff --git a/vim/snippets/python/try.snippet b/vim/snippets/python/try.snippet
deleted file mode 100755
index c623953..0000000
--- a/vim/snippets/python/try.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-try:
-	${1}
-except ${2:Exception}:
-	${3}
diff --git a/vim/snippets/rst.snippets b/vim/snippets/rst.snippets
deleted file mode 100755
index 283bb26..0000000
--- a/vim/snippets/rst.snippets
+++ /dev/null
@@ -1,16 +0,0 @@
-# rst
-## Some filesystems have trouble with some characters in these triggers in filenames, so leaving in here.
-
-snippet :
-	:${1:Text}: ${2:blah blah}
-snippet *
-	*${1:Emphasis}*
-snippet **
-	**${1:Strong emphasis}**
-snippet =
-	${1:Title}
-	=====${2:=}
-	${3}
-snippet cont:
-	.. contents::
-	
diff --git a/vim/snippets/rst/-.snippet b/vim/snippets/rst/-.snippet
deleted file mode 100755
index e43df80..0000000
--- a/vim/snippets/rst/-.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:Title}
------${2:-}
-${3}
diff --git a/vim/snippets/rst/_.snippet b/vim/snippets/rst/_.snippet
deleted file mode 100755
index dc5d467..0000000
--- a/vim/snippets/rst/_.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-\`${1:Text}\`_
-.. _\`$1\`: ${2:blah blah}
diff --git a/vim/snippets/ruby-factorygirl/fac.snippet b/vim/snippets/ruby-factorygirl/fac.snippet
deleted file mode 100755
index 05cc3e8..0000000
--- a/vim/snippets/ruby-factorygirl/fac.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Factory(:${1}, ${2})${3}
diff --git a/vim/snippets/ruby-factorygirl/faca.snippet b/vim/snippets/ruby-factorygirl/faca.snippet
deleted file mode 100755
index ffc3d76..0000000
--- a/vim/snippets/ruby-factorygirl/faca.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Factory.attributes_for(:${1}, ${2})${3}
diff --git a/vim/snippets/ruby-factorygirl/facb.snippet b/vim/snippets/ruby-factorygirl/facb.snippet
deleted file mode 100755
index 299c033..0000000
--- a/vim/snippets/ruby-factorygirl/facb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Factory.build(:${1}, ${2})${3}
diff --git a/vim/snippets/ruby-factorygirl/facc.snippet b/vim/snippets/ruby-factorygirl/facc.snippet
deleted file mode 100755
index 9cb1f73..0000000
--- a/vim/snippets/ruby-factorygirl/facc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Factory.create(:${1})${2}
diff --git a/vim/snippets/ruby-factorygirl/facd.snippet b/vim/snippets/ruby-factorygirl/facd.snippet
deleted file mode 100755
index 7dcd6d9..0000000
--- a/vim/snippets/ruby-factorygirl/facd.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-Factory.define(:${1:model}) do |f|
-	${2}
-end
-${3}
diff --git a/vim/snippets/ruby-factorygirl/facn.snippet b/vim/snippets/ruby-factorygirl/facn.snippet
deleted file mode 100755
index 7232308..0000000
--- a/vim/snippets/ruby-factorygirl/facn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Factory.next(:${1:sequence-name})${2}
diff --git a/vim/snippets/ruby-factorygirl/facs.snippet b/vim/snippets/ruby-factorygirl/facs.snippet
deleted file mode 100755
index 13fd5b9..0000000
--- a/vim/snippets/ruby-factorygirl/facs.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-Factory.sequence :${1:sequence-name} do |${2:m}|
-	${3}
-end
-${4}
diff --git a/vim/snippets/ruby-machinist/bluep.snippet b/vim/snippets/ruby-machinist/bluep.snippet
deleted file mode 100755
index 0a783a8..0000000
--- a/vim/snippets/ruby-machinist/bluep.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:Model}.blueprint do
-  ${2}
-end
diff --git a/vim/snippets/ruby-machinist/mm_ma.snippet b/vim/snippets/ruby-machinist/mm_ma.snippet
deleted file mode 100755
index 1c4b259..0000000
--- a/vim/snippets/ruby-machinist/mm_ma.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:Model}.make
diff --git a/vim/snippets/ruby-machinist/mmn.snippet b/vim/snippets/ruby-machinist/mmn.snippet
deleted file mode 100755
index 4189110..0000000
--- a/vim/snippets/ruby-machinist/mmn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:Model}.make(${2::symbol})
diff --git a/vim/snippets/ruby-machinist/mp.snippet b/vim/snippets/ruby-machinist/mp.snippet
deleted file mode 100755
index ecb381d..0000000
--- a/vim/snippets/ruby-machinist/mp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:Model}.plan
diff --git a/vim/snippets/ruby-machinist/mp_ma.snippet b/vim/snippets/ruby-machinist/mp_ma.snippet
deleted file mode 100755
index ecb381d..0000000
--- a/vim/snippets/ruby-machinist/mp_ma.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:Model}.plan
diff --git a/vim/snippets/ruby-machinist/mpn.snippet b/vim/snippets/ruby-machinist/mpn.snippet
deleted file mode 100755
index 2fa6166..0000000
--- a/vim/snippets/ruby-machinist/mpn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:Model}.plan(${2::symbol})
diff --git a/vim/snippets/ruby-machinist/plan.snippet b/vim/snippets/ruby-machinist/plan.snippet
deleted file mode 100755
index ecb381d..0000000
--- a/vim/snippets/ruby-machinist/plan.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:Model}.plan
diff --git a/vim/snippets/ruby-machinist/sham.snippet b/vim/snippets/ruby-machinist/sham.snippet
deleted file mode 100755
index f5157dc..0000000
--- a/vim/snippets/ruby-machinist/sham.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Sham.define do
-  ${1}
-end
diff --git a/vim/snippets/ruby-rails-rjs/hide.snippet b/vim/snippets/ruby-rails-rjs/hide.snippet
deleted file mode 100755
index c20ac57..0000000
--- a/vim/snippets/ruby-rails-rjs/hide.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.hide "${1}"
diff --git a/vim/snippets/ruby-rails-rjs/ins.snippet b/vim/snippets/ruby-rails-rjs/ins.snippet
deleted file mode 100755
index ec67dec..0000000
--- a/vim/snippets/ruby-rails-rjs/ins.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.insert_html :${1}, "${2:id}", :partial => "${3:template}"
diff --git a/vim/snippets/ruby-rails-rjs/rep.snippet b/vim/snippets/ruby-rails-rjs/rep.snippet
deleted file mode 100755
index d8d2058..0000000
--- a/vim/snippets/ruby-rails-rjs/rep.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.replace "${1:id}", :partial => "${:template}"
diff --git a/vim/snippets/ruby-rails-rjs/reph.snippet b/vim/snippets/ruby-rails-rjs/reph.snippet
deleted file mode 100755
index b622cf2..0000000
--- a/vim/snippets/ruby-rails-rjs/reph.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.replace_html "${1:id}", :partial => "${2:template}"
diff --git a/vim/snippets/ruby-rails-rjs/show.snippet b/vim/snippets/ruby-rails-rjs/show.snippet
deleted file mode 100755
index 7f6cf3d..0000000
--- a/vim/snippets/ruby-rails-rjs/show.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.show "${1:id}"
diff --git a/vim/snippets/ruby-rails-rjs/tog.snippet b/vim/snippets/ruby-rails-rjs/tog.snippet
deleted file mode 100755
index b6d438b..0000000
--- a/vim/snippets/ruby-rails-rjs/tog.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.toggle "${1:id}"
diff --git a/vim/snippets/ruby-rails-rjs/vis.snippet b/vim/snippets/ruby-rails-rjs/vis.snippet
deleted file mode 100755
index e0cba96..0000000
--- a/vim/snippets/ruby-rails-rjs/vis.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.visual_effect :${1}, "${2:id}"
diff --git a/vim/snippets/ruby-rails/ac.snippet b/vim/snippets/ruby-rails/ac.snippet
deleted file mode 100755
index 3230893..0000000
--- a/vim/snippets/ruby-rails/ac.snippet
+++ /dev/null
@@ -1 +0,0 @@
-after_create :${1:method}
diff --git a/vim/snippets/ruby-rails/anaf.snippet b/vim/snippets/ruby-rails/anaf.snippet
deleted file mode 100755
index 2a0939d..0000000
--- a/vim/snippets/ruby-rails/anaf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-accepts_nested_attributes_for :${1:object}
diff --git a/vim/snippets/ruby-rails/art.snippet b/vim/snippets/ruby-rails/art.snippet
deleted file mode 100755
index a5a7d34..0000000
--- a/vim/snippets/ruby-rails/art.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_redirected_to ${1::action => "${2:index}"}
diff --git a/vim/snippets/ruby-rails/artnp.snippet b/vim/snippets/ruby-rails/artnp.snippet
deleted file mode 100755
index 2c9bfef..0000000
--- a/vim/snippets/ruby-rails/artnp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_redirected_to <+<+parent+>_<+child+>_path(<+@<+parent+>+>, <+@<+child+>+>)+>
diff --git a/vim/snippets/ruby-rails/artnpp.snippet b/vim/snippets/ruby-rails/artnpp.snippet
deleted file mode 100755
index becd79b..0000000
--- a/vim/snippets/ruby-rails/artnpp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_redirected_to <+<+parent+>_<+child+>_path(<+@<+parent+>+>)+>
diff --git a/vim/snippets/ruby-rails/artp.snippet b/vim/snippets/ruby-rails/artp.snippet
deleted file mode 100755
index 55b9204..0000000
--- a/vim/snippets/ruby-rails/artp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_redirected_to <+<+model+>_path(<+@<+model+>+>)+>
diff --git a/vim/snippets/ruby-rails/artpp.snippet b/vim/snippets/ruby-rails/artpp.snippet
deleted file mode 100755
index 1d1d203..0000000
--- a/vim/snippets/ruby-rails/artpp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_redirected_to <+<+model+>s_path+>
diff --git a/vim/snippets/ruby-rails/asd.snippet b/vim/snippets/ruby-rails/asd.snippet
deleted file mode 100755
index 35ab730..0000000
--- a/vim/snippets/ruby-rails/asd.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-assert_difference "${1:Model}.${2:count}", $1 do
-	${3}
-end
diff --git a/vim/snippets/ruby-rails/asnd.snippet b/vim/snippets/ruby-rails/asnd.snippet
deleted file mode 100755
index c5124e0..0000000
--- a/vim/snippets/ruby-rails/asnd.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-assert_no_difference "${1:Model}.${2:count}" do
-	${3}
-end
diff --git a/vim/snippets/ruby-rails/asre.snippet b/vim/snippets/ruby-rails/asre.snippet
deleted file mode 100755
index d0ac6b2..0000000
--- a/vim/snippets/ruby-rails/asre.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_response :${1:success}, @response.body${2}
diff --git a/vim/snippets/ruby-rails/asrj.snippet b/vim/snippets/ruby-rails/asrj.snippet
deleted file mode 100755
index 6ee13f2..0000000
--- a/vim/snippets/ruby-rails/asrj.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_rjs :<+replace+>, <+"<+dom id+>"+>
diff --git a/vim/snippets/ruby-rails/ass.snippet b/vim/snippets/ruby-rails/ass.snippet
deleted file mode 100755
index 4cc696f..0000000
--- a/vim/snippets/ruby-rails/ass.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_select '<+path+>'<+, :<+text+> => <+'<+inner_html+>'+>+> <+do<++>+>
diff --git a/vim/snippets/ruby-rails/bc.snippet b/vim/snippets/ruby-rails/bc.snippet
deleted file mode 100755
index 7fed4bf..0000000
--- a/vim/snippets/ruby-rails/bc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-before_create :${1:method}
diff --git a/vim/snippets/ruby-rails/bf.snippet b/vim/snippets/ruby-rails/bf.snippet
deleted file mode 100755
index ad25cc9..0000000
--- a/vim/snippets/ruby-rails/bf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-before_filter :${1:method}
diff --git a/vim/snippets/ruby-rails/bt.snippet b/vim/snippets/ruby-rails/bt.snippet
deleted file mode 100755
index b28e1e6..0000000
--- a/vim/snippets/ruby-rails/bt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-belongs_to :${1:association}
diff --git a/vim/snippets/ruby-rails/cr.snippet b/vim/snippets/ruby-rails/cr.snippet
deleted file mode 100755
index 8492316..0000000
--- a/vim/snippets/ruby-rails/cr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-cattr_reader :${1:attr_names}
diff --git a/vim/snippets/ruby-rails/crw.snippet b/vim/snippets/ruby-rails/crw.snippet
deleted file mode 100755
index 3b1ab61..0000000
--- a/vim/snippets/ruby-rails/crw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-cattr_accessor :${1:attr_names}
diff --git a/vim/snippets/ruby-rails/cw.snippet b/vim/snippets/ruby-rails/cw.snippet
deleted file mode 100755
index 07ffc8e..0000000
--- a/vim/snippets/ruby-rails/cw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-cattr_writer :${1:attr_names}
diff --git a/vim/snippets/ruby-rails/defcreate.snippet b/vim/snippets/ruby-rails/defcreate.snippet
deleted file mode 100755
index e878d3a..0000000
--- a/vim/snippets/ruby-rails/defcreate.snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-def create
-	@${1:model_class_name} = ${2:ModelClassName}.new(params[:$1])
-
-	respond_to do |wants|
-		if @$1.save
-			flash[:notice] = '$2 was successfully created.'
-			wants.html { redirect_to(@$1) }
-			wants.xml  { render :xml => @$1, :status => :created, :location => @$1 }
-		else
-			wants.html { render :action => "new" }
-			wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
-		end
-	end
-end${3}
diff --git a/vim/snippets/ruby-rails/defdestroy.snippet b/vim/snippets/ruby-rails/defdestroy.snippet
deleted file mode 100755
index 9c34080..0000000
--- a/vim/snippets/ruby-rails/defdestroy.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-def destroy
-	@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-	@$1.destroy
-
-	respond_to do |wants|
-		wants.html { redirect_to($1s_url) }
-		wants.xml  { head :ok }
-	end
-end${3}
diff --git a/vim/snippets/ruby-rails/defedit.snippet b/vim/snippets/ruby-rails/defedit.snippet
deleted file mode 100755
index 0e80dcb..0000000
--- a/vim/snippets/ruby-rails/defedit.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def edit
-	@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-end
diff --git a/vim/snippets/ruby-rails/defindex.snippet b/vim/snippets/ruby-rails/defindex.snippet
deleted file mode 100755
index 2265c63..0000000
--- a/vim/snippets/ruby-rails/defindex.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-def index
-  @${1:model_class_name}s = ${2:ModelClassName}.all
-
-  respond_to do |wants|
-    wants.html # index.html.erb
-    wants.xml  { render :xml => @$1s }
-  end
-end${3}
diff --git a/vim/snippets/ruby-rails/defnew.snippet b/vim/snippets/ruby-rails/defnew.snippet
deleted file mode 100755
index 0a4762b..0000000
--- a/vim/snippets/ruby-rails/defnew.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-def new
-	@${1:model_class_name} = ${2:ModelClassName}.new
-
-	respond_to do |wants|
-		wants.html # new.html.erb
-		wants.xml  { render :xml => @$1 }
-	end
-end${3}
diff --git a/vim/snippets/ruby-rails/defshow.snippet b/vim/snippets/ruby-rails/defshow.snippet
deleted file mode 100755
index ba745d5..0000000
--- a/vim/snippets/ruby-rails/defshow.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-def show
-	@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-
-	respond_to do |wants|
-		wants.html # show.html.erb
-		wants.xml  { render :xml => @$1 }
-	end
-end${3}
diff --git a/vim/snippets/ruby-rails/defupdate.snippet b/vim/snippets/ruby-rails/defupdate.snippet
deleted file mode 100755
index 0556895..0000000
--- a/vim/snippets/ruby-rails/defupdate.snippet
+++ /dev/null
@@ -1,14 +0,0 @@
-def update
-	@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
-
-	respond_to do |wants|
-		if @$1.update_attributes(params[:$1])
-			flash[:notice] = '$2 was successfully updated.'
-			wants.html { redirect_to(@$1) }
-			wants.xml  { head :ok }
-		else
-			wants.html { render :action => "edit" }
-			wants.xml  { render :xml => @$1.errors, :status => :unprocessable_entity }
-		end
-	end
-end${3}
diff --git a/vim/snippets/ruby-rails/fina.snippet b/vim/snippets/ruby-rails/fina.snippet
deleted file mode 100755
index fc0af5a..0000000
--- a/vim/snippets/ruby-rails/fina.snippet
+++ /dev/null
@@ -1 +0,0 @@
-find(:all, :conditions => ['${1:field} = ?', ${2:true}])${3}
diff --git a/vim/snippets/ruby-rails/finf.snippet b/vim/snippets/ruby-rails/finf.snippet
deleted file mode 100755
index b50df63..0000000
--- a/vim/snippets/ruby-rails/finf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-find(:first, :conditions => ['${1:field} = ?', ${2:true}])${3}
diff --git a/vim/snippets/ruby-rails/fini.snippet b/vim/snippets/ruby-rails/fini.snippet
deleted file mode 100755
index 9adce48..0000000
--- a/vim/snippets/ruby-rails/fini.snippet
+++ /dev/null
@@ -1 +0,0 @@
-find(${1:id})${2}
diff --git a/vim/snippets/ruby-rails/finl.snippet b/vim/snippets/ruby-rails/finl.snippet
deleted file mode 100755
index 9d5e472..0000000
--- a/vim/snippets/ruby-rails/finl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-find(:last, :conditions => ['${1:field} = ?', ${2:true}])${3}
diff --git a/vim/snippets/ruby-rails/flash.snippet b/vim/snippets/ruby-rails/flash.snippet
deleted file mode 100755
index 2a06930..0000000
--- a/vim/snippets/ruby-rails/flash.snippet
+++ /dev/null
@@ -1 +0,0 @@
-flash[:${1:notice}] = "${2}"
diff --git a/vim/snippets/ruby-rails/habtm.snippet b/vim/snippets/ruby-rails/habtm.snippet
deleted file mode 100755
index 1b27396..0000000
--- a/vim/snippets/ruby-rails/habtm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-has_and_belongs_to_many :${1:object}, :join_table => "${2:table_name}", :foreign_key => "${3}_id"${4}
diff --git a/vim/snippets/ruby-rails/hm.snippet b/vim/snippets/ruby-rails/hm.snippet
deleted file mode 100755
index 9204df5..0000000
--- a/vim/snippets/ruby-rails/hm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-has_many :${1:object}
diff --git a/vim/snippets/ruby-rails/hmd.snippet b/vim/snippets/ruby-rails/hmd.snippet
deleted file mode 100755
index 6aadd73..0000000
--- a/vim/snippets/ruby-rails/hmd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-has_many :<+object+>s<+, :class_name => "<+object+>", :foreign_key => "<+reference+>_id"+>, :dependent => :destroy<++>
diff --git a/vim/snippets/ruby-rails/hmt.snippet b/vim/snippets/ruby-rails/hmt.snippet
deleted file mode 100755
index 4128e03..0000000
--- a/vim/snippets/ruby-rails/hmt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-has_many :${1:object}, :through => :${2:object}
diff --git a/vim/snippets/ruby-rails/ho.snippet b/vim/snippets/ruby-rails/ho.snippet
deleted file mode 100755
index 77e14e7..0000000
--- a/vim/snippets/ruby-rails/ho.snippet
+++ /dev/null
@@ -1 +0,0 @@
-has_one :${1:object}
diff --git a/vim/snippets/ruby-rails/i18.snippet b/vim/snippets/ruby-rails/i18.snippet
deleted file mode 100755
index 2a30fae..0000000
--- a/vim/snippets/ruby-rails/i18.snippet
+++ /dev/null
@@ -1 +0,0 @@
-I18n.t('${1:type.key}')${2}
diff --git a/vim/snippets/ruby-rails/ist.snippet b/vim/snippets/ruby-rails/ist.snippet
deleted file mode 100755
index d97d482..0000000
--- a/vim/snippets/ruby-rails/ist.snippet
+++ /dev/null
@@ -1 +0,0 @@
-<%= image_submit_tag("<+agree.png+>"<+<+, :id => "<+id+>"+><+, :name => "<+name+>"+><+, :class => "<+class+>"+><+, :disabled => <+false+>+>+>) %>
diff --git a/vim/snippets/ruby-rails/log.snippet b/vim/snippets/ruby-rails/log.snippet
deleted file mode 100755
index 53360dd..0000000
--- a/vim/snippets/ruby-rails/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-RAILS_DEFAULT_LOGGER.${1:debug} ${2}
diff --git a/vim/snippets/ruby-rails/logd.snippet b/vim/snippets/ruby-rails/logd.snippet
deleted file mode 100755
index 36236a3..0000000
--- a/vim/snippets/ruby-rails/logd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-logger.debug { "${1:message}" }${2}
diff --git a/vim/snippets/ruby-rails/loge.snippet b/vim/snippets/ruby-rails/loge.snippet
deleted file mode 100755
index 4417ad2..0000000
--- a/vim/snippets/ruby-rails/loge.snippet
+++ /dev/null
@@ -1 +0,0 @@
-logger.error { "${1:message}" }${2}
diff --git a/vim/snippets/ruby-rails/logf.snippet b/vim/snippets/ruby-rails/logf.snippet
deleted file mode 100755
index 1bd419c..0000000
--- a/vim/snippets/ruby-rails/logf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-logger.fatal { "${1:message}" }${2}
diff --git a/vim/snippets/ruby-rails/logi.snippet b/vim/snippets/ruby-rails/logi.snippet
deleted file mode 100755
index bf508dc..0000000
--- a/vim/snippets/ruby-rails/logi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-logger.info { "${1:message}" }${2}
diff --git a/vim/snippets/ruby-rails/logw.snippet b/vim/snippets/ruby-rails/logw.snippet
deleted file mode 100755
index 447f688..0000000
--- a/vim/snippets/ruby-rails/logw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-logger.warn { "${1:message}" }${2}
diff --git a/vim/snippets/ruby-rails/mac.snippet b/vim/snippets/ruby-rails/mac.snippet
deleted file mode 100755
index 548d4af..0000000
--- a/vim/snippets/ruby-rails/mac.snippet
+++ /dev/null
@@ -1 +0,0 @@
-add_column :${1:table}, :${2:column}, :${3:type}
diff --git a/vim/snippets/ruby-rails/mapc.snippet b/vim/snippets/ruby-rails/mapc.snippet
deleted file mode 100755
index b14ec4c..0000000
--- a/vim/snippets/ruby-rails/mapc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:map}.${2:connect} '${3:controller/:action/:id}'
diff --git a/vim/snippets/ruby-rails/mapca.snippet b/vim/snippets/ruby-rails/mapca.snippet
deleted file mode 100755
index 9292ffe..0000000
--- a/vim/snippets/ruby-rails/mapca.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"${5}
diff --git a/vim/snippets/ruby-rails/mapr.snippet b/vim/snippets/ruby-rails/mapr.snippet
deleted file mode 100755
index 424805b..0000000
--- a/vim/snippets/ruby-rails/mapr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:map}.resource :${2:resource}
diff --git a/vim/snippets/ruby-rails/maprs.snippet b/vim/snippets/ruby-rails/maprs.snippet
deleted file mode 100755
index a18c4df..0000000
--- a/vim/snippets/ruby-rails/maprs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:map}.resources :${2:resource}
diff --git a/vim/snippets/ruby-rails/mapwo.snippet b/vim/snippets/ruby-rails/mapwo.snippet
deleted file mode 100755
index b3cf791..0000000
--- a/vim/snippets/ruby-rails/mapwo.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-${1:map}.with_options :${2:controller} => '${3:thing}' do |$3|
-	${4}
-end
diff --git a/vim/snippets/ruby-rails/mbs.snippet b/vim/snippets/ruby-rails/mbs.snippet
deleted file mode 100755
index a3b34bb..0000000
--- a/vim/snippets/ruby-rails/mbs.snippet
+++ /dev/null
@@ -1 +0,0 @@
-before_save :${1:method}
diff --git a/vim/snippets/ruby-rails/mcc.snippet b/vim/snippets/ruby-rails/mcc.snippet
deleted file mode 100755
index 74dc7af..0000000
--- a/vim/snippets/ruby-rails/mcc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-change_column :${1:table}, :${2:column}, :${3:type}
diff --git a/vim/snippets/ruby-rails/mccc.snippet b/vim/snippets/ruby-rails/mccc.snippet
deleted file mode 100755
index 2915a37..0000000
--- a/vim/snippets/ruby-rails/mccc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-t.column :${1:title}, :${2:string}
diff --git a/vim/snippets/ruby-rails/mcht.snippet b/vim/snippets/ruby-rails/mcht.snippet
deleted file mode 100755
index a71b473..0000000
--- a/vim/snippets/ruby-rails/mcht.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-change_table :${1:table_name} do |t|
-	${2}
-end
diff --git a/vim/snippets/ruby-rails/mcol.snippet b/vim/snippets/ruby-rails/mcol.snippet
deleted file mode 100755
index 8a5bd1f..0000000
--- a/vim/snippets/ruby-rails/mcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-remove_column :${1:table}, :${2:column}
diff --git a/vim/snippets/ruby-rails/mct.snippet b/vim/snippets/ruby-rails/mct.snippet
deleted file mode 100755
index 8dbe1ea..0000000
--- a/vim/snippets/ruby-rails/mct.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-create_table :${1:table_name} do |t|
-	t.column :${2:name}, :${3:type}
-end
diff --git a/vim/snippets/ruby-rails/migration.snippet b/vim/snippets/ruby-rails/migration.snippet
deleted file mode 100755
index 9f54e0b..0000000
--- a/vim/snippets/ruby-rails/migration.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-class ${1:`Snippet_MigrationNameFromFilename()`} < ActiveRecord::Migration
-	def self.up
-		${2}
-	end
-
-	def self.down
-	end
-end
diff --git a/vim/snippets/ruby-rails/mp.snippet b/vim/snippets/ruby-rails/mp.snippet
deleted file mode 100755
index 1264a59..0000000
--- a/vim/snippets/ruby-rails/mp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-map(&:${1:id})
diff --git a/vim/snippets/ruby-rails/mrc.snippet b/vim/snippets/ruby-rails/mrc.snippet
deleted file mode 100755
index 8a5bd1f..0000000
--- a/vim/snippets/ruby-rails/mrc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-remove_column :${1:table}, :${2:column}
diff --git a/vim/snippets/ruby-rails/mrmc.snippet b/vim/snippets/ruby-rails/mrmc.snippet
deleted file mode 100755
index 8a5bd1f..0000000
--- a/vim/snippets/ruby-rails/mrmc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-remove_column :${1:table}, :${2:column}
diff --git a/vim/snippets/ruby-rails/mrnc.snippet b/vim/snippets/ruby-rails/mrnc.snippet
deleted file mode 100755
index 6e16721..0000000
--- a/vim/snippets/ruby-rails/mrnc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-rename_column :${1:table}, :${2:old}, :${3:new}
diff --git a/vim/snippets/ruby-rails/mrw.snippet b/vim/snippets/ruby-rails/mrw.snippet
deleted file mode 100755
index 9ef0f8f..0000000
--- a/vim/snippets/ruby-rails/mrw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-mattr_accessor :${1:attr_names}
diff --git a/vim/snippets/ruby-rails/mtab.snippet b/vim/snippets/ruby-rails/mtab.snippet
deleted file mode 100755
index 9f0e7f0..0000000
--- a/vim/snippets/ruby-rails/mtab.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-create_table :${1:table} do |t|
-  ${2}
-end
diff --git a/vim/snippets/ruby-rails/nc.snippet b/vim/snippets/ruby-rails/nc.snippet
deleted file mode 100755
index cfc42ca..0000000
--- a/vim/snippets/ruby-rails/nc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-named_scope :<+name+><+, :joins => :<+table+>+>, :conditions => <+['<+<+field+> = ?+>', <+true+>]+>
diff --git a/vim/snippets/ruby-rails/ncl.snippet b/vim/snippets/ruby-rails/ncl.snippet
deleted file mode 100755
index c420ef2..0000000
--- a/vim/snippets/ruby-rails/ncl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-named_scope :<+name+>, lambda { |<+param+>| { :conditions => <+['<+<+field+> = ?+>', <+param+>]+> } }
diff --git a/vim/snippets/ruby-rails/pa.snippet b/vim/snippets/ruby-rails/pa.snippet
deleted file mode 100755
index 14fa54f..0000000
--- a/vim/snippets/ruby-rails/pa.snippet
+++ /dev/null
@@ -1 +0,0 @@
-params[:${1:id}]${2}
diff --git a/vim/snippets/ruby-rails/ra.snippet b/vim/snippets/ruby-rails/ra.snippet
deleted file mode 100755
index 56a9bbf..0000000
--- a/vim/snippets/ruby-rails/ra.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :action => "${1:action}"
diff --git a/vim/snippets/ruby-rails/ral.snippet b/vim/snippets/ruby-rails/ral.snippet
deleted file mode 100755
index 0a0b202..0000000
--- a/vim/snippets/ruby-rails/ral.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :action => "${1:action}", :layout => "${2:layoutname}"
diff --git a/vim/snippets/ruby-rails/rest.snippet b/vim/snippets/ruby-rails/rest.snippet
deleted file mode 100755
index ad61342..0000000
--- a/vim/snippets/ruby-rails/rest.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-respond_to do |f|
-	f.html
-	f.js do
-		${1:render}
-	end
-end
diff --git a/vim/snippets/ruby-rails/rf.snippet b/vim/snippets/ruby-rails/rf.snippet
deleted file mode 100755
index 76fcdb1..0000000
--- a/vim/snippets/ruby-rails/rf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :file => "${1:filepath}"
diff --git a/vim/snippets/ruby-rails/rfu.snippet b/vim/snippets/ruby-rails/rfu.snippet
deleted file mode 100755
index c0bb72b..0000000
--- a/vim/snippets/ruby-rails/rfu.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :file => "${1:filepath}", :use_full_path => ${2:false}
diff --git a/vim/snippets/ruby-rails/ri.snippet b/vim/snippets/ruby-rails/ri.snippet
deleted file mode 100755
index 17a0404..0000000
--- a/vim/snippets/ruby-rails/ri.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :inline => "<+<%= 'hello' %>+>"
diff --git a/vim/snippets/ruby-rails/ril.snippet b/vim/snippets/ruby-rails/ril.snippet
deleted file mode 100755
index b1801aa..0000000
--- a/vim/snippets/ruby-rails/ril.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"${4} }
diff --git a/vim/snippets/ruby-rails/rit.snippet b/vim/snippets/ruby-rails/rit.snippet
deleted file mode 100755
index b3cd834..0000000
--- a/vim/snippets/ruby-rails/rit.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml}
diff --git a/vim/snippets/ruby-rails/rjson.snippet b/vim/snippets/ruby-rails/rjson.snippet
deleted file mode 100755
index fece1fc..0000000
--- a/vim/snippets/ruby-rails/rjson.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :json => ${1:text to render}
diff --git a/vim/snippets/ruby-rails/rl.snippet b/vim/snippets/ruby-rails/rl.snippet
deleted file mode 100755
index 53e8340..0000000
--- a/vim/snippets/ruby-rails/rl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :layout => "${1:layoutname}"
diff --git a/vim/snippets/ruby-rails/rn.snippet b/vim/snippets/ruby-rails/rn.snippet
deleted file mode 100755
index 6c6b0fe..0000000
--- a/vim/snippets/ruby-rails/rn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :nothing => ${1:true}
diff --git a/vim/snippets/ruby-rails/rns.snippet b/vim/snippets/ruby-rails/rns.snippet
deleted file mode 100755
index d1a581f..0000000
--- a/vim/snippets/ruby-rails/rns.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :nothing => ${1:true}, :status => ${2:401}
diff --git a/vim/snippets/ruby-rails/rp.snippet b/vim/snippets/ruby-rails/rp.snippet
deleted file mode 100755
index 0c5daa2..0000000
--- a/vim/snippets/ruby-rails/rp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :partial => "${1:item}"
diff --git a/vim/snippets/ruby-rails/rpc.snippet b/vim/snippets/ruby-rails/rpc.snippet
deleted file mode 100755
index 570644b..0000000
--- a/vim/snippets/ruby-rails/rpc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :partial => "<+item+>", :collection => <+@<+item+>s+>
diff --git a/vim/snippets/ruby-rails/rpl.snippet b/vim/snippets/ruby-rails/rpl.snippet
deleted file mode 100755
index 6981fbc..0000000
--- a/vim/snippets/ruby-rails/rpl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :partial => "<+item+>", :locals => { :<+item+> => <+@<+item+>+><++> }
diff --git a/vim/snippets/ruby-rails/rpo.snippet b/vim/snippets/ruby-rails/rpo.snippet
deleted file mode 100755
index bab9da9..0000000
--- a/vim/snippets/ruby-rails/rpo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :partial => "<+item+>", :object => <+@<+item+>+>
diff --git a/vim/snippets/ruby-rails/rps.snippet b/vim/snippets/ruby-rails/rps.snippet
deleted file mode 100755
index aef4c49..0000000
--- a/vim/snippets/ruby-rails/rps.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :partial => "${1:item}", :status => ${2:500}
diff --git a/vim/snippets/ruby-rails/rt.snippet b/vim/snippets/ruby-rails/rt.snippet
deleted file mode 100755
index c464879..0000000
--- a/vim/snippets/ruby-rails/rt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :text => "${1:text to render}"
diff --git a/vim/snippets/ruby-rails/rtl.snippet b/vim/snippets/ruby-rails/rtl.snippet
deleted file mode 100755
index fc78bf1..0000000
--- a/vim/snippets/ruby-rails/rtl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :text => "${1:text to render}", :layout => "${2:layoutname}"
diff --git a/vim/snippets/ruby-rails/rtlt.snippet b/vim/snippets/ruby-rails/rtlt.snippet
deleted file mode 100755
index 69618be..0000000
--- a/vim/snippets/ruby-rails/rtlt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :text => "${1:text to render}", :layout => ${2:true}
diff --git a/vim/snippets/ruby-rails/rts.snippet b/vim/snippets/ruby-rails/rts.snippet
deleted file mode 100755
index 04fe409..0000000
--- a/vim/snippets/ruby-rails/rts.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :text => "${1:text to render}", :status => ${2:401}
diff --git a/vim/snippets/ruby-rails/ru.snippet b/vim/snippets/ruby-rails/ru.snippet
deleted file mode 100755
index 3a2d1ed..0000000
--- a/vim/snippets/ruby-rails/ru.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-render :update do |${1:page}|
-	$1.${2}
-end
diff --git a/vim/snippets/ruby-rails/rxml.snippet b/vim/snippets/ruby-rails/rxml.snippet
deleted file mode 100755
index e4e721a..0000000
--- a/vim/snippets/ruby-rails/rxml.snippet
+++ /dev/null
@@ -1 +0,0 @@
-render :xml => ${1:text to render}
diff --git a/vim/snippets/ruby-rails/sha1.snippet b/vim/snippets/ruby-rails/sha1.snippet
deleted file mode 100755
index 1984747..0000000
--- a/vim/snippets/ruby-rails/sha1.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Digest::SHA1.hexdigest(${1:string})
diff --git a/vim/snippets/ruby-rails/sweeper.snippet b/vim/snippets/ruby-rails/sweeper.snippet
deleted file mode 100755
index 659aeb0..0000000
--- a/vim/snippets/ruby-rails/sweeper.snippet
+++ /dev/null
@@ -1,15 +0,0 @@
-class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
-	observe $1
-
-	def after_save(${2:model_class_name})
-		expire_cache($2)
-	end
-
-	def after_destroy($2)
-		expire_cache($2)
-	end
-
-	def expire_cache($2)
-		expire_page
-	end
-end
diff --git a/vim/snippets/ruby-rails/tcb.snippet b/vim/snippets/ruby-rails/tcb.snippet
deleted file mode 100755
index 021740d..0000000
--- a/vim/snippets/ruby-rails/tcb.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.boolean :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tcbi.snippet b/vim/snippets/ruby-rails/tcbi.snippet
deleted file mode 100755
index 3e6d3c9..0000000
--- a/vim/snippets/ruby-rails/tcbi.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.binary :<+title+><+, :limit => <+2+>.megabytes+>
-<++>
diff --git a/vim/snippets/ruby-rails/tcd.snippet b/vim/snippets/ruby-rails/tcd.snippet
deleted file mode 100755
index c3048dc..0000000
--- a/vim/snippets/ruby-rails/tcd.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.decimal :${1:title}<+<+, :precision => <+10+>+><+, :scale => <+2+>+>+>
-<++>
diff --git a/vim/snippets/ruby-rails/tcda.snippet b/vim/snippets/ruby-rails/tcda.snippet
deleted file mode 100755
index b716e8b..0000000
--- a/vim/snippets/ruby-rails/tcda.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.date :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tcdt.snippet b/vim/snippets/ruby-rails/tcdt.snippet
deleted file mode 100755
index d060532..0000000
--- a/vim/snippets/ruby-rails/tcdt.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.datetime :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tcf.snippet b/vim/snippets/ruby-rails/tcf.snippet
deleted file mode 100755
index f09f790..0000000
--- a/vim/snippets/ruby-rails/tcf.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.float :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tch.snippet b/vim/snippets/ruby-rails/tch.snippet
deleted file mode 100755
index bcce727..0000000
--- a/vim/snippets/ruby-rails/tch.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.change :<+name+><+, :<+string+><+, :<+limit+> => <+80+>+>+>
-<++>
diff --git a/vim/snippets/ruby-rails/tci.snippet b/vim/snippets/ruby-rails/tci.snippet
deleted file mode 100755
index 7cb011c..0000000
--- a/vim/snippets/ruby-rails/tci.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.integer :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tcl.snippet b/vim/snippets/ruby-rails/tcl.snippet
deleted file mode 100755
index ffa359f..0000000
--- a/vim/snippets/ruby-rails/tcl.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.integer :lock_version, :null => false, :default => 0
-${1}
diff --git a/vim/snippets/ruby-rails/tcr.snippet b/vim/snippets/ruby-rails/tcr.snippet
deleted file mode 100755
index 2b421dd..0000000
--- a/vim/snippets/ruby-rails/tcr.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.references :<+taggable+><+, :polymorphic => <+{ :default => '<+Photo+>' }+>+>
-<++>
diff --git a/vim/snippets/ruby-rails/tcs.snippet b/vim/snippets/ruby-rails/tcs.snippet
deleted file mode 100755
index a7b8473..0000000
--- a/vim/snippets/ruby-rails/tcs.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.string :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tct.snippet b/vim/snippets/ruby-rails/tct.snippet
deleted file mode 100755
index f28518f..0000000
--- a/vim/snippets/ruby-rails/tct.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.text :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tcti.snippet b/vim/snippets/ruby-rails/tcti.snippet
deleted file mode 100755
index 0006c81..0000000
--- a/vim/snippets/ruby-rails/tcti.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.time :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tcts.snippet b/vim/snippets/ruby-rails/tcts.snippet
deleted file mode 100755
index e46e844..0000000
--- a/vim/snippets/ruby-rails/tcts.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.timestamp :${1:title}
-${2}
diff --git a/vim/snippets/ruby-rails/tctss.snippet b/vim/snippets/ruby-rails/tctss.snippet
deleted file mode 100755
index f009ee6..0000000
--- a/vim/snippets/ruby-rails/tctss.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.timestamps
-${1}
diff --git a/vim/snippets/ruby-rails/test.snippet b/vim/snippets/ruby-rails/test.snippet
deleted file mode 100755
index 8164798..0000000
--- a/vim/snippets/ruby-rails/test.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-test "${1:case_name}" do
-	${2}
-end
diff --git a/vim/snippets/ruby-rails/trc.snippet b/vim/snippets/ruby-rails/trc.snippet
deleted file mode 100755
index 2d6250a..0000000
--- a/vim/snippets/ruby-rails/trc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-t.remove :${1:column}
diff --git a/vim/snippets/ruby-rails/tre.snippet b/vim/snippets/ruby-rails/tre.snippet
deleted file mode 100755
index 8f70788..0000000
--- a/vim/snippets/ruby-rails/tre.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-t.rename :<+old_column_name+>, :<+new_column_name+>
-<++>
diff --git a/vim/snippets/ruby-rails/tref.snippet b/vim/snippets/ruby-rails/tref.snippet
deleted file mode 100755
index 1286786..0000000
--- a/vim/snippets/ruby-rails/tref.snippet
+++ /dev/null
@@ -1 +0,0 @@
-t.references :${1:model}
diff --git a/vim/snippets/ruby-rails/va.snippet b/vim/snippets/ruby-rails/va.snippet
deleted file mode 100755
index 064bb7b..0000000
--- a/vim/snippets/ruby-rails/va.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_associated :${1:attribute}
diff --git a/vim/snippets/ruby-rails/vao.snippet b/vim/snippets/ruby-rails/vao.snippet
deleted file mode 100755
index 4c6c98b..0000000
--- a/vim/snippets/ruby-rails/vao.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_acceptance_of :${1:terms}
diff --git a/vim/snippets/ruby-rails/vc.snippet b/vim/snippets/ruby-rails/vc.snippet
deleted file mode 100755
index 0aa1a75..0000000
--- a/vim/snippets/ruby-rails/vc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_confirmation_of :${1:attribute}
diff --git a/vim/snippets/ruby-rails/ve.snippet b/vim/snippets/ruby-rails/ve.snippet
deleted file mode 100755
index b6a4c4d..0000000
--- a/vim/snippets/ruby-rails/ve.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_exclusion_of :${1:attribute}, :in => ${2:%w( mov avi )}
diff --git a/vim/snippets/ruby-rails/vf.snippet b/vim/snippets/ruby-rails/vf.snippet
deleted file mode 100755
index adc142c..0000000
--- a/vim/snippets/ruby-rails/vf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_format_of :${1:attribute}, :with => /${2:regex}/
diff --git a/vim/snippets/ruby-rails/vi.snippet b/vim/snippets/ruby-rails/vi.snippet
deleted file mode 100755
index 8ba16d2..0000000
--- a/vim/snippets/ruby-rails/vi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_inclusion_of :${1:attribute}, :in => %w(${2: mov avi })
diff --git a/vim/snippets/ruby-rails/vl.snippet b/vim/snippets/ruby-rails/vl.snippet
deleted file mode 100755
index 71d802b..0000000
--- a/vim/snippets/ruby-rails/vl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_length_of :${1:attribute}, :within => ${2:3}..${3:20}
diff --git a/vim/snippets/ruby-rails/vn.snippet b/vim/snippets/ruby-rails/vn.snippet
deleted file mode 100755
index 34bfaa7..0000000
--- a/vim/snippets/ruby-rails/vn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_numericality_of :${1:attribute}
diff --git a/vim/snippets/ruby-rails/vp.snippet b/vim/snippets/ruby-rails/vp.snippet
deleted file mode 100755
index 6ddbdab..0000000
--- a/vim/snippets/ruby-rails/vp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_presence_of :${1:attr}
diff --git a/vim/snippets/ruby-rails/vpo.snippet b/vim/snippets/ruby-rails/vpo.snippet
deleted file mode 100755
index c8fdff9..0000000
--- a/vim/snippets/ruby-rails/vpo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_presence_of :${1:attribute}
diff --git a/vim/snippets/ruby-rails/vu.snippet b/vim/snippets/ruby-rails/vu.snippet
deleted file mode 100755
index 0c06e65..0000000
--- a/vim/snippets/ruby-rails/vu.snippet
+++ /dev/null
@@ -1 +0,0 @@
-validates_uniqueness_of :${1:attribute}
diff --git a/vim/snippets/ruby-rails/wants.snippet b/vim/snippets/ruby-rails/wants.snippet
deleted file mode 100755
index 909c8d5..0000000
--- a/vim/snippets/ruby-rails/wants.snippet
+++ /dev/null
@@ -1 +0,0 @@
-wants.<+js|xml|html+> <+{ <++> }+>
diff --git a/vim/snippets/ruby-rails/xdelete.snippet b/vim/snippets/ruby-rails/xdelete.snippet
deleted file mode 100755
index 41184e9..0000000
--- a/vim/snippets/ruby-rails/xdelete.snippet
+++ /dev/null
@@ -1 +0,0 @@
-xhr :delete, :${1:destroy}, :id => ${2:1}${3}
diff --git a/vim/snippets/ruby-rails/xget.snippet b/vim/snippets/ruby-rails/xget.snippet
deleted file mode 100755
index 1ae7834..0000000
--- a/vim/snippets/ruby-rails/xget.snippet
+++ /dev/null
@@ -1 +0,0 @@
-xhr :get, :<+show+><+, :id => <+1+>+><++>
diff --git a/vim/snippets/ruby-rails/xpost.snippet b/vim/snippets/ruby-rails/xpost.snippet
deleted file mode 100755
index 3681a95..0000000
--- a/vim/snippets/ruby-rails/xpost.snippet
+++ /dev/null
@@ -1 +0,0 @@
-xhr :post, :${1:create}, :${2:object} => { ${3} }
diff --git a/vim/snippets/ruby-rails/xput.snippet b/vim/snippets/ruby-rails/xput.snippet
deleted file mode 100755
index f046f2e..0000000
--- a/vim/snippets/ruby-rails/xput.snippet
+++ /dev/null
@@ -1 +0,0 @@
-xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { ${4} }${5}
diff --git a/vim/snippets/ruby-rspec/Given.snippet b/vim/snippets/ruby-rspec/Given.snippet
deleted file mode 100755
index c0e39e6..0000000
--- a/vim/snippets/ruby-rspec/Given.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Given /^${1:something} ${2:"([^\"]*)"}$/ do |${3:arg1}|
-  ${4:pending}
-end
diff --git a/vim/snippets/ruby-rspec/Then.snippet b/vim/snippets/ruby-rspec/Then.snippet
deleted file mode 100755
index 5b799fe..0000000
--- a/vim/snippets/ruby-rspec/Then.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Then /^${1:something} ${2:"([^\"]*)"}$/ do |${3:arg1}|
-  ${4:pending}
-end
diff --git a/vim/snippets/ruby-rspec/When.snippet b/vim/snippets/ruby-rspec/When.snippet
deleted file mode 100755
index af4e0fd..0000000
--- a/vim/snippets/ruby-rspec/When.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-When /^${1:something} ${2:"([^\"]*)"}$/ do |${3:arg1}|
-  ${4:pending}
-end
diff --git a/vim/snippets/ruby-rspec/aft.snippet b/vim/snippets/ruby-rspec/aft.snippet
deleted file mode 100755
index 528f1b3..0000000
--- a/vim/snippets/ruby-rspec/aft.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-after(${1::each}) do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/annot.snippet b/vim/snippets/ruby-rspec/annot.snippet
deleted file mode 100755
index 7199170..0000000
--- a/vim/snippets/ruby-rspec/annot.snippet
+++ /dev/null
@@ -1 +0,0 @@
-any_number_of_times
diff --git a/vim/snippets/ruby-rspec/anr.snippet b/vim/snippets/ruby-rspec/anr.snippet
deleted file mode 100755
index 573addd..0000000
--- a/vim/snippets/ruby-rspec/anr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-and_return(${1:value})
diff --git a/vim/snippets/ruby-rspec/anra.snippet b/vim/snippets/ruby-rspec/anra.snippet
deleted file mode 100755
index ab03deb..0000000
--- a/vim/snippets/ruby-rspec/anra.snippet
+++ /dev/null
@@ -1 +0,0 @@
-and_raise(${1:exception})
diff --git a/vim/snippets/ruby-rspec/anrb.snippet b/vim/snippets/ruby-rspec/anrb.snippet
deleted file mode 100755
index e313a51..0000000
--- a/vim/snippets/ruby-rspec/anrb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-and_return { ${1} }
diff --git a/vim/snippets/ruby-rspec/ant.snippet b/vim/snippets/ruby-rspec/ant.snippet
deleted file mode 100755
index d230e92..0000000
--- a/vim/snippets/ruby-rspec/ant.snippet
+++ /dev/null
@@ -1 +0,0 @@
-and_throw(${1:sym})
diff --git a/vim/snippets/ruby-rspec/any.snippet b/vim/snippets/ruby-rspec/any.snippet
deleted file mode 100755
index 34c08d6..0000000
--- a/vim/snippets/ruby-rspec/any.snippet
+++ /dev/null
@@ -1 +0,0 @@
-and_yield(${1:values})
diff --git a/vim/snippets/ruby-rspec/atl.snippet b/vim/snippets/ruby-rspec/atl.snippet
deleted file mode 100755
index b95128b..0000000
--- a/vim/snippets/ruby-rspec/atl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-at_least(${1:n}).times
diff --git a/vim/snippets/ruby-rspec/atm.snippet b/vim/snippets/ruby-rspec/atm.snippet
deleted file mode 100755
index fa5c606..0000000
--- a/vim/snippets/ruby-rspec/atm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-at_most(${1:n}).times
diff --git a/vim/snippets/ruby-rspec/bef.snippet b/vim/snippets/ruby-rspec/bef.snippet
deleted file mode 100755
index f96608c..0000000
--- a/vim/snippets/ruby-rspec/bef.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-before(${1::each}) do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/befi.snippet b/vim/snippets/ruby-rspec/befi.snippet
deleted file mode 100755
index c29db8b..0000000
--- a/vim/snippets/ruby-rspec/befi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-before(:each) { ${1} }
diff --git a/vim/snippets/ruby-rspec/cap.snippet b/vim/snippets/ruby-rspec/cap.snippet
deleted file mode 100755
index 49d3891..0000000
--- a/vim/snippets/ruby-rspec/cap.snippet
+++ /dev/null
@@ -1 +0,0 @@
-"([^\"]*)"
diff --git a/vim/snippets/ruby-rspec/conn.snippet b/vim/snippets/ruby-rspec/conn.snippet
deleted file mode 100755
index 4bd9d23..0000000
--- a/vim/snippets/ruby-rspec/conn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-controller_name :${1:controller}
diff --git a/vim/snippets/ruby-rspec/cont.snippet b/vim/snippets/ruby-rspec/cont.snippet
deleted file mode 100755
index d884e0a..0000000
--- a/vim/snippets/ruby-rspec/cont.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-context "${1}" do
-  ${2}
-end
diff --git a/vim/snippets/ruby-rspec/des.snippet b/vim/snippets/ruby-rspec/des.snippet
deleted file mode 100755
index f0cfc51..0000000
--- a/vim/snippets/ruby-rspec/des.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-describe ${1:subject} do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/desc.snippet b/vim/snippets/ruby-rspec/desc.snippet
deleted file mode 100755
index 3a25035..0000000
--- a/vim/snippets/ruby-rspec/desc.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe ${1:controller} do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/desrc.snippet b/vim/snippets/ruby-rspec/desrc.snippet
deleted file mode 100755
index a9c8ac2..0000000
--- a/vim/snippets/ruby-rspec/desrc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-describe ${1:controller}, "${2:GET|POST|PUT|DELETE} ${3:/some/path}${4}" do
-	${5}
-end
diff --git a/vim/snippets/ruby-rspec/dess.snippet b/vim/snippets/ruby-rspec/dess.snippet
deleted file mode 100755
index 78233fa..0000000
--- a/vim/snippets/ruby-rspec/dess.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-describe "${1:name}" do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/dest.snippet b/vim/snippets/ruby-rspec/dest.snippet
deleted file mode 100755
index b3b3e01..0000000
--- a/vim/snippets/ruby-rspec/dest.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-describe ${1:Type} do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/dests.snippet b/vim/snippets/ruby-rspec/dests.snippet
deleted file mode 100755
index 89e9372..0000000
--- a/vim/snippets/ruby-rspec/dests.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-describe ${1:Type}, "${2:description}" do
-	${3}
-end
diff --git a/vim/snippets/ruby-rspec/ex.snippet b/vim/snippets/ruby-rspec/ex.snippet
deleted file mode 100755
index 2e5a4a0..0000000
--- a/vim/snippets/ruby-rspec/ex.snippet
+++ /dev/null
@@ -1 +0,0 @@
-exactly(${1:n}).times
diff --git a/vim/snippets/ruby-rspec/isbl.snippet b/vim/snippets/ruby-rspec/isbl.snippet
deleted file mode 100755
index 728223f..0000000
--- a/vim/snippets/ruby-rspec/isbl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-it_should_behave_like '${1:do something}'
diff --git a/vim/snippets/ruby-rspec/it.snippet b/vim/snippets/ruby-rspec/it.snippet
deleted file mode 100755
index 8af38db..0000000
--- a/vim/snippets/ruby-rspec/it.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-it "${1}" do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/it.snippet.orig b/vim/snippets/ruby-rspec/it.snippet.orig
deleted file mode 100755
index 5c63f11..0000000
--- a/vim/snippets/ruby-rspec/it.snippet.orig
+++ /dev/null
@@ -1,8 +0,0 @@
-<<<<<<< HEAD:ruby-rspec/it.snippet
-it '${1}' do
-  ${2}
-=======
-it "${1}" do
-	${2}
->>>>>>> 7e58374... Ruby rspec snippets improvements:ruby-rspec/it.snippet
-end
diff --git a/vim/snippets/ruby-rspec/itb.snippet b/vim/snippets/ruby-rspec/itb.snippet
deleted file mode 100755
index ca2a48f..0000000
--- a/vim/snippets/ruby-rspec/itb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-it { ${1} }
diff --git a/vim/snippets/ruby-rspec/iti.snippet b/vim/snippets/ruby-rspec/iti.snippet
deleted file mode 100755
index 10a9237..0000000
--- a/vim/snippets/ruby-rspec/iti.snippet
+++ /dev/null
@@ -1 +0,0 @@
-it { should ${1} }
diff --git a/vim/snippets/ruby-rspec/its.snippet b/vim/snippets/ruby-rspec/its.snippet
deleted file mode 100755
index 704ef19..0000000
--- a/vim/snippets/ruby-rspec/its.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-it "should ${1:work correctly}" do
-  ${2}
-end
diff --git a/vim/snippets/ruby-rspec/itsh.snippet b/vim/snippets/ruby-rspec/itsh.snippet
deleted file mode 100755
index ee1fa16..0000000
--- a/vim/snippets/ruby-rspec/itsh.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-it "should ${1:do something}" do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/let.snippet b/vim/snippets/ruby-rspec/let.snippet
deleted file mode 100755
index 36dfd44..0000000
--- a/vim/snippets/ruby-rspec/let.snippet
+++ /dev/null
@@ -1 +0,0 @@
-let(:${1}) { ${2} }
diff --git a/vim/snippets/ruby-rspec/mat.snippet b/vim/snippets/ruby-rspec/mat.snippet
deleted file mode 100755
index 2f04771..0000000
--- a/vim/snippets/ruby-rspec/mat.snippet
+++ /dev/null
@@ -1,24 +0,0 @@
-class ${1:ReverseTo}
-	def initialize(${2:param})
-		@$2 = $2
-	end
-
-	def matches?(actual)
-		@actual = actual
-		# Satisfy expectation here. Return false or raise an error if it's not met.
-		${3:@actual.reverse.should == @$2}
-		true
-	end
-
-	def failure_message
-		"expected #{@actual.inspect} to ${4} #{@$2.inspect}, but it didn't"
-	end
-
-	def negative_failure_message
-		"expected #{@actual.inspect} not to ${5} #{@$2.inspect}, but it did"
-	end
-end
-
-def ${6:reverse_to}(${7:expected})
-	${8}.new($7)
-end
diff --git a/vim/snippets/ruby-rspec/mm.snippet b/vim/snippets/ruby-rspec/mm.snippet
deleted file mode 100755
index b10aa1d..0000000
--- a/vim/snippets/ruby-rspec/mm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-mock_model(${1:model})${2}
diff --git a/vim/snippets/ruby-rspec/moc.snippet b/vim/snippets/ruby-rspec/moc.snippet
deleted file mode 100755
index 4ff954f..0000000
--- a/vim/snippets/ruby-rspec/moc.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:var} = mock("${2:mock_name}"${3:, :null_object => true})
-${4}
diff --git a/vim/snippets/ruby-rspec/mocw.snippet b/vim/snippets/ruby-rspec/mocw.snippet
deleted file mode 100755
index 09f93e0..0000000
--- a/vim/snippets/ruby-rspec/mocw.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Spec::Runner.configure do |config|
-	config.mock_with :${1:mocha|flexmock|rr}
-end
diff --git a/vim/snippets/ruby-rspec/on.snippet b/vim/snippets/ruby-rspec/on.snippet
deleted file mode 100755
index b2d1a77..0000000
--- a/vim/snippets/ruby-rspec/on.snippet
+++ /dev/null
@@ -1 +0,0 @@
-once
diff --git a/vim/snippets/ruby-rspec/pshc.snippet b/vim/snippets/ruby-rspec/pshc.snippet
deleted file mode 100755
index d586f6a..0000000
--- a/vim/snippets/ruby-rspec/pshc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-page.should have_content "${1}"
diff --git a/vim/snippets/ruby-rspec/resh.snippet b/vim/snippets/ruby-rspec/resh.snippet
deleted file mode 100755
index 91cd5b0..0000000
--- a/vim/snippets/ruby-rspec/resh.snippet
+++ /dev/null
@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
diff --git a/vim/snippets/ruby-rspec/sce.snippet b/vim/snippets/ruby-rspec/sce.snippet
deleted file mode 100755
index 1e00d30..0000000
--- a/vim/snippets/ruby-rspec/sce.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-scenario "${1}" do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/sef.snippet b/vim/snippets/ruby-rspec/sef.snippet
deleted file mode 100755
index 89d3411..0000000
--- a/vim/snippets/ruby-rspec/sef.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-shared_examples_for "${1:do something}" do
-  ${2}
-end
diff --git a/vim/snippets/ruby-rspec/sh.snippet b/vim/snippets/ruby-rspec/sh.snippet
deleted file mode 100755
index 67530e9..0000000
--- a/vim/snippets/ruby-rspec/sh.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should == ${2:value}
-${3}
diff --git a/vim/snippets/ruby-rspec/shanaf.snippet b/vim/snippets/ruby-rspec/shanaf.snippet
deleted file mode 100755
index aac9ed3..0000000
--- a/vim/snippets/ruby-rspec/shanaf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_accept_nested_attributes_for :${1:association}
diff --git a/vim/snippets/ruby-rspec/shb.snippet b/vim/snippets/ruby-rspec/shb.snippet
deleted file mode 100755
index b909d9c..0000000
--- a/vim/snippets/ruby-rspec/shb.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should be(${2:result})
-${3}
diff --git a/vim/snippets/ruby-rspec/shbc.snippet b/vim/snippets/ruby-rspec/shbc.snippet
deleted file mode 100755
index 9080a3c..0000000
--- a/vim/snippets/ruby-rspec/shbc.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should be_close(${2:result}, ${3:tolerance})
-${4}
diff --git a/vim/snippets/ruby-rspec/shbio.snippet b/vim/snippets/ruby-rspec/shbio.snippet
deleted file mode 100755
index 98a7389..0000000
--- a/vim/snippets/ruby-rspec/shbio.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should be_instance_of(${2:class})
-${3}
diff --git a/vim/snippets/ruby-rspec/shbko.snippet b/vim/snippets/ruby-rspec/shbko.snippet
deleted file mode 100755
index 74bf852..0000000
--- a/vim/snippets/ruby-rspec/shbko.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should be_a_kind_of(${2:class})
-${3}
diff --git a/vim/snippets/ruby-rspec/shbr.snippet b/vim/snippets/ruby-rspec/shbr.snippet
deleted file mode 100755
index 887ef80..0000000
--- a/vim/snippets/ruby-rspec/shbr.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should be_redirect
-${1}
diff --git a/vim/snippets/ruby-rspec/shbs.snippet b/vim/snippets/ruby-rspec/shbs.snippet
deleted file mode 100755
index 602074b..0000000
--- a/vim/snippets/ruby-rspec/shbs.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should be_success
-${1}
diff --git a/vim/snippets/ruby-rspec/shc.snippet b/vim/snippets/ruby-rspec/shc.snippet
deleted file mode 100755
index 082cb16..0000000
--- a/vim/snippets/ruby-rspec/shc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-lambda do
-	${1}
-end.should change(${2:described_class}, :${3:count}).by(${4:1})
diff --git a/vim/snippets/ruby-rspec/shdm.snippet b/vim/snippets/ruby-rspec/shdm.snippet
deleted file mode 100755
index e82d82e..0000000
--- a/vim/snippets/ruby-rspec/shdm.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should match(/${2:regexp}/)
-${3}
diff --git a/vim/snippets/ruby-rspec/she.snippet b/vim/snippets/ruby-rspec/she.snippet
deleted file mode 100755
index f896a26..0000000
--- a/vim/snippets/ruby-rspec/she.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should eql(${2:value})
-${3}
diff --git a/vim/snippets/ruby-rspec/sheq.snippet b/vim/snippets/ruby-rspec/sheq.snippet
deleted file mode 100755
index e3c389e..0000000
--- a/vim/snippets/ruby-rspec/sheq.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should equal(${2:value})
-${3}
diff --git a/vim/snippets/ruby-rspec/shh.snippet b/vim/snippets/ruby-rspec/shh.snippet
deleted file mode 100755
index 93189cb..0000000
--- a/vim/snippets/ruby-rspec/shh.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should have(${2:num}).${3:things}
-${4}
diff --git a/vim/snippets/ruby-rspec/shhal.snippet b/vim/snippets/ruby-rspec/shhal.snippet
deleted file mode 100755
index dabe237..0000000
--- a/vim/snippets/ruby-rspec/shhal.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should have_at_least(${2:num}).${3:things}
-${4}
diff --git a/vim/snippets/ruby-rspec/shham.snippet b/vim/snippets/ruby-rspec/shham.snippet
deleted file mode 100755
index 7072add..0000000
--- a/vim/snippets/ruby-rspec/shham.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should have_at_most(${2:num}).${3:things}
-${4}
diff --git a/vim/snippets/ruby-rspec/shhr.snippet b/vim/snippets/ruby-rspec/shhr.snippet
deleted file mode 100755
index b8a8997..0000000
--- a/vim/snippets/ruby-rspec/shhr.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should have(${2:n}).records
-${3}
diff --git a/vim/snippets/ruby-rspec/shn.snippet b/vim/snippets/ruby-rspec/shn.snippet
deleted file mode 100755
index b19cbb6..0000000
--- a/vim/snippets/ruby-rspec/shn.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not == ${2:value}
-${3}
diff --git a/vim/snippets/ruby-rspec/shnb.snippet b/vim/snippets/ruby-rspec/shnb.snippet
deleted file mode 100755
index a34d62e..0000000
--- a/vim/snippets/ruby-rspec/shnb.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not be(${2:result})
-${3}
diff --git a/vim/snippets/ruby-rspec/shnbc.snippet b/vim/snippets/ruby-rspec/shnbc.snippet
deleted file mode 100755
index 55ac6d3..0000000
--- a/vim/snippets/ruby-rspec/shnbc.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not be_close(${2:result}, ${3:tolerance})
-${4}
diff --git a/vim/snippets/ruby-rspec/shnbio.snippet b/vim/snippets/ruby-rspec/shnbio.snippet
deleted file mode 100755
index b6f1526..0000000
--- a/vim/snippets/ruby-rspec/shnbio.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not be_instance_of(${2:klass})
-${3}
diff --git a/vim/snippets/ruby-rspec/shnbko.snippet b/vim/snippets/ruby-rspec/shnbko.snippet
deleted file mode 100755
index 0b0cfc7..0000000
--- a/vim/snippets/ruby-rspec/shnbko.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not be_a_kind_of(${2:klass})
-${3}
diff --git a/vim/snippets/ruby-rspec/shnbr.snippet b/vim/snippets/ruby-rspec/shnbr.snippet
deleted file mode 100755
index 25519b0..0000000
--- a/vim/snippets/ruby-rspec/shnbr.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should_not be_redirect
-${1}
diff --git a/vim/snippets/ruby-rspec/shnbs.snippet b/vim/snippets/ruby-rspec/shnbs.snippet
deleted file mode 100755
index 7d35ab2..0000000
--- a/vim/snippets/ruby-rspec/shnbs.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should_not be_success
-${1}
diff --git a/vim/snippets/ruby-rspec/shnc.snippet b/vim/snippets/ruby-rspec/shnc.snippet
deleted file mode 100755
index 7baead2..0000000
--- a/vim/snippets/ruby-rspec/shnc.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-lambda do
-	${1}
-end.should_not change(${2:target}, :${3:method})
diff --git a/vim/snippets/ruby-rspec/shne.snippet b/vim/snippets/ruby-rspec/shne.snippet
deleted file mode 100755
index 68a7451..0000000
--- a/vim/snippets/ruby-rspec/shne.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not eql(${2:value})
-${3}
diff --git a/vim/snippets/ruby-rspec/shneq.snippet b/vim/snippets/ruby-rspec/shneq.snippet
deleted file mode 100755
index da4f59b..0000000
--- a/vim/snippets/ruby-rspec/shneq.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-	${1:target}.should_not equal(${2:value})
-	${3}
diff --git a/vim/snippets/ruby-rspec/shnm.snippet b/vim/snippets/ruby-rspec/shnm.snippet
deleted file mode 100755
index ee7b604..0000000
--- a/vim/snippets/ruby-rspec/shnm.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not match(/${2:regexp}/)
-${3}
diff --git a/vim/snippets/ruby-rspec/shnp.snippet b/vim/snippets/ruby-rspec/shnp.snippet
deleted file mode 100755
index 9f1298b..0000000
--- a/vim/snippets/ruby-rspec/shnp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:target}.should_not be_${2:predicate}
diff --git a/vim/snippets/ruby-rspec/shnr.snippet b/vim/snippets/ruby-rspec/shnr.snippet
deleted file mode 100755
index 98c0fc0..0000000
--- a/vim/snippets/ruby-rspec/shnr.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:mock}.should_not_receive(:${2:message})${3}
-${4}
diff --git a/vim/snippets/ruby-rspec/shnre.snippet b/vim/snippets/ruby-rspec/shnre.snippet
deleted file mode 100755
index fbf9604..0000000
--- a/vim/snippets/ruby-rspec/shnre.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not raise_error(${2:error})
-${3}
diff --git a/vim/snippets/ruby-rspec/shnredt.snippet b/vim/snippets/ruby-rspec/shnredt.snippet
deleted file mode 100755
index 2afb69c..0000000
--- a/vim/snippets/ruby-rspec/shnredt.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should_not redirect_to(${1:url})
-${2}
diff --git a/vim/snippets/ruby-rspec/shnrt.snippet b/vim/snippets/ruby-rspec/shnrt.snippet
deleted file mode 100755
index c2c5f2c..0000000
--- a/vim/snippets/ruby-rspec/shnrt.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not respond_to(:${2:sym})
-${3}
diff --git a/vim/snippets/ruby-rspec/shns.snippet b/vim/snippets/ruby-rspec/shns.snippet
deleted file mode 100755
index b73a71c..0000000
--- a/vim/snippets/ruby-rspec/shns.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should_not satisfy { |${2:obj}| ${3} }
-${4}
diff --git a/vim/snippets/ruby-rspec/shnt.snippet b/vim/snippets/ruby-rspec/shnt.snippet
deleted file mode 100755
index 0353376..0000000
--- a/vim/snippets/ruby-rspec/shnt.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-lambda { ${1} }.should_not throw_symbol(:${2:symbol})
-${3}
diff --git a/vim/snippets/ruby-rspec/shp.snippet b/vim/snippets/ruby-rspec/shp.snippet
deleted file mode 100755
index 9267b61..0000000
--- a/vim/snippets/ruby-rspec/shp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:target}.should be_${2:predicate}
diff --git a/vim/snippets/ruby-rspec/shr.snippet b/vim/snippets/ruby-rspec/shr.snippet
deleted file mode 100755
index 4effa2c..0000000
--- a/vim/snippets/ruby-rspec/shr.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:mock}.should_receive(:${2:message})${3}
-${4}
diff --git a/vim/snippets/ruby-rspec/shre.snippet b/vim/snippets/ruby-rspec/shre.snippet
deleted file mode 100755
index 420bbe8..0000000
--- a/vim/snippets/ruby-rspec/shre.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should raise_error(${2:error})
-${3}
diff --git a/vim/snippets/ruby-rspec/shredt.snippet b/vim/snippets/ruby-rspec/shredt.snippet
deleted file mode 100755
index 979c1d6..0000000
--- a/vim/snippets/ruby-rspec/shredt.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should redirect_to(${1:url})
-${2}
diff --git a/vim/snippets/ruby-rspec/shrt.snippet b/vim/snippets/ruby-rspec/shrt.snippet
deleted file mode 100755
index a796ebd..0000000
--- a/vim/snippets/ruby-rspec/shrt.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should respond_to(:${2:sym})
-${3}
diff --git a/vim/snippets/ruby-rspec/shs.snippet b/vim/snippets/ruby-rspec/shs.snippet
deleted file mode 100755
index 08eb941..0000000
--- a/vim/snippets/ruby-rspec/shs.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should satisfy { |${2:obj}| ${3} }
-${4}
diff --git a/vim/snippets/ruby-rspec/sht.snippet b/vim/snippets/ruby-rspec/sht.snippet
deleted file mode 100755
index 86f55fa..0000000
--- a/vim/snippets/ruby-rspec/sht.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-${1:target}.should throw_symble(:${2:symbol})
-${3}
diff --git a/vim/snippets/ruby-rspec/shtemp.snippet b/vim/snippets/ruby-rspec/shtemp.snippet
deleted file mode 100755
index 9b08c10..0000000
--- a/vim/snippets/ruby-rspec/shtemp.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-response.should render_template(:${1:template})
-${2}
diff --git a/vim/snippets/ruby-rspec/shvp.snippet b/vim/snippets/ruby-rspec/shvp.snippet
deleted file mode 100755
index 13598f8..0000000
--- a/vim/snippets/ruby-rspec/shvp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_validate_presence_of :${1:field}
diff --git a/vim/snippets/ruby-rspec/spec.snippet b/vim/snippets/ruby-rspec/spec.snippet
deleted file mode 100755
index 20dcd7b..0000000
--- a/vim/snippets/ruby-rspec/spec.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper' 
-
-describe ${1:`Snippet_RubySpecNameFromFilename()`} do
-	${2}
-end
diff --git a/vim/snippets/ruby-rspec/st.snippet b/vim/snippets/ruby-rspec/st.snippet
deleted file mode 100755
index 3f90aa5..0000000
--- a/vim/snippets/ruby-rspec/st.snippet
+++ /dev/null
@@ -1 +0,0 @@
-stub!(:${1}).and_return(${2})
diff --git a/vim/snippets/ruby-rspec/sub.snippet b/vim/snippets/ruby-rspec/sub.snippet
deleted file mode 100755
index 57c63d3..0000000
--- a/vim/snippets/ruby-rspec/sub.snippet
+++ /dev/null
@@ -1 +0,0 @@
-subject { ${1} }
diff --git a/vim/snippets/ruby-rspec/tw.snippet b/vim/snippets/ruby-rspec/tw.snippet
deleted file mode 100755
index 6ebb6d4..0000000
--- a/vim/snippets/ruby-rspec/tw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-twice
diff --git a/vim/snippets/ruby-rspec/wia.snippet b/vim/snippets/ruby-rspec/wia.snippet
deleted file mode 100755
index 21eda19..0000000
--- a/vim/snippets/ruby-rspec/wia.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-with(${1:args})
-${2}
diff --git a/vim/snippets/ruby-shoulda/context.snippet b/vim/snippets/ruby-shoulda/context.snippet
deleted file mode 100755
index 0e5a7fd..0000000
--- a/vim/snippets/ruby-shoulda/context.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-context "${1:context}" do
-
-	${2}
-
-end
diff --git a/vim/snippets/ruby-shoulda/samao.snippet b/vim/snippets/ruby-shoulda/samao.snippet
deleted file mode 100755
index cfd4e59..0000000
--- a/vim/snippets/ruby-shoulda/samao.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_allow_mass_assignment_of :${1:field}
diff --git a/vim/snippets/ruby-shoulda/savf.snippet b/vim/snippets/ruby-shoulda/savf.snippet
deleted file mode 100755
index 39cfd6f..0000000
--- a/vim/snippets/ruby-shoulda/savf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_allow_values_for :${1:field}, "${2:value}"
diff --git a/vim/snippets/ruby-shoulda/sbt.snippet b/vim/snippets/ruby-shoulda/sbt.snippet
deleted file mode 100755
index 90d25c8..0000000
--- a/vim/snippets/ruby-shoulda/sbt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_belong_to :${1:association}
diff --git a/vim/snippets/ruby-shoulda/selal.snippet b/vim/snippets/ruby-shoulda/selal.snippet
deleted file mode 100755
index 2fc48b4..0000000
--- a/vim/snippets/ruby-shoulda/selal.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_ensure_length_at_least :${1:field}, ${2:min_length}
diff --git a/vim/snippets/ruby-shoulda/seli.snippet b/vim/snippets/ruby-shoulda/seli.snippet
deleted file mode 100755
index 8bc2bf8..0000000
--- a/vim/snippets/ruby-shoulda/seli.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_ensure_length_is :${1:field}, ${2:length}
diff --git a/vim/snippets/ruby-shoulda/selir.snippet b/vim/snippets/ruby-shoulda/selir.snippet
deleted file mode 100755
index 1f0bdc9..0000000
--- a/vim/snippets/ruby-shoulda/selir.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_ensure_length_in_range :${1:field}, ${2:start}..${3:end}
diff --git a/vim/snippets/ruby-shoulda/setup.snippet b/vim/snippets/ruby-shoulda/setup.snippet
deleted file mode 100755
index 68b895c..0000000
--- a/vim/snippets/ruby-shoulda/setup.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-setup do
-	${1}
-end
diff --git a/vim/snippets/ruby-shoulda/sevir.snippet b/vim/snippets/ruby-shoulda/sevir.snippet
deleted file mode 100755
index 195f748..0000000
--- a/vim/snippets/ruby-shoulda/sevir.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_ensure_value_in_range :${1:field}, ${2:start}..${3:end}
diff --git a/vim/snippets/ruby-shoulda/shabtm.snippet b/vim/snippets/ruby-shoulda/shabtm.snippet
deleted file mode 100755
index 03c70e2..0000000
--- a/vim/snippets/ruby-shoulda/shabtm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_and_belong_to_many :${1:association}
diff --git a/vim/snippets/ruby-shoulda/shcm.snippet b/vim/snippets/ruby-shoulda/shcm.snippet
deleted file mode 100755
index 6948aea..0000000
--- a/vim/snippets/ruby-shoulda/shcm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_class_methods :${1:method}
diff --git a/vim/snippets/ruby-shoulda/shdc.snippet b/vim/snippets/ruby-shoulda/shdc.snippet
deleted file mode 100755
index d841d65..0000000
--- a/vim/snippets/ruby-shoulda/shdc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_db_columns :${1:field}
diff --git a/vim/snippets/ruby-shoulda/shi.snippet b/vim/snippets/ruby-shoulda/shi.snippet
deleted file mode 100755
index d6d2b38..0000000
--- a/vim/snippets/ruby-shoulda/shi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_indices :${1:field}
diff --git a/vim/snippets/ruby-shoulda/shim.snippet b/vim/snippets/ruby-shoulda/shim.snippet
deleted file mode 100755
index 1f44252..0000000
--- a/vim/snippets/ruby-shoulda/shim.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_instance_methods :${1:method}
diff --git a/vim/snippets/ruby-shoulda/shm.snippet b/vim/snippets/ruby-shoulda/shm.snippet
deleted file mode 100755
index 8c98c17..0000000
--- a/vim/snippets/ruby-shoulda/shm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_many :${1:association}
diff --git a/vim/snippets/ruby-shoulda/shns.snippet b/vim/snippets/ruby-shoulda/shns.snippet
deleted file mode 100644
index a02046d..0000000
--- a/vim/snippets/ruby-shoulda/shns.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_named_scope :${1:scope}, :conditions => {${2:conditions}}
diff --git a/vim/snippets/ruby-shoulda/sho.snippet b/vim/snippets/ruby-shoulda/sho.snippet
deleted file mode 100755
index a652b4f..0000000
--- a/vim/snippets/ruby-shoulda/sho.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_one :${1:association}
diff --git a/vim/snippets/ruby-shoulda/shroa.snippet b/vim/snippets/ruby-shoulda/shroa.snippet
deleted file mode 100755
index 022015d..0000000
--- a/vim/snippets/ruby-shoulda/shroa.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_have_read_only_attributes :${1:field}
diff --git a/vim/snippets/ruby-shoulda/snamao.snippet b/vim/snippets/ruby-shoulda/snamao.snippet
deleted file mode 100755
index 236190b..0000000
--- a/vim/snippets/ruby-shoulda/snamao.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_not_allow_mass_assignment_of :${1:field}
diff --git a/vim/snippets/ruby-shoulda/snavf.snippet b/vim/snippets/ruby-shoulda/snavf.snippet
deleted file mode 100755
index 029c5ba..0000000
--- a/vim/snippets/ruby-shoulda/snavf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_not_allow_values_for :${1:field}, "${2:value}"
diff --git a/vim/snippets/ruby-shoulda/svao.snippet b/vim/snippets/ruby-shoulda/svao.snippet
deleted file mode 100755
index 8eccb88..0000000
--- a/vim/snippets/ruby-shoulda/svao.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_validate_acceptance_of :${1:field}
diff --git a/vim/snippets/ruby-shoulda/svno.snippet b/vim/snippets/ruby-shoulda/svno.snippet
deleted file mode 100755
index a90c1ca..0000000
--- a/vim/snippets/ruby-shoulda/svno.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_validate_numericality_of :${1:field}
diff --git a/vim/snippets/ruby-shoulda/svp.snippet b/vim/snippets/ruby-shoulda/svp.snippet
deleted file mode 100755
index 13598f8..0000000
--- a/vim/snippets/ruby-shoulda/svp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_validate_presence_of :${1:field}
diff --git a/vim/snippets/ruby-shoulda/svpo.snippet b/vim/snippets/ruby-shoulda/svpo.snippet
deleted file mode 100755
index 13598f8..0000000
--- a/vim/snippets/ruby-shoulda/svpo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_validate_presence_of :${1:field}
diff --git a/vim/snippets/ruby-shoulda/svuo.snippet b/vim/snippets/ruby-shoulda/svuo.snippet
deleted file mode 100755
index 6e26912..0000000
--- a/vim/snippets/ruby-shoulda/svuo.snippet
+++ /dev/null
@@ -1 +0,0 @@
-should_validate_uniqueness_of :${1:field}, :scoped_to => ${2:arrayofnames}
diff --git a/vim/snippets/ruby/#!.snippet b/vim/snippets/ruby/#!.snippet
deleted file mode 100755
index 98daaf1..0000000
--- a/vim/snippets/ruby/#!.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby${1: -wKU}
-${2}
diff --git a/vim/snippets/ruby/#.snippet b/vim/snippets/ruby/#.snippet
deleted file mode 100755
index e54e063..0000000
--- a/vim/snippets/ruby/#.snippet
+++ /dev/null
@@ -1 +0,0 @@
-# =>
diff --git a/vim/snippets/ruby/Md.snippet b/vim/snippets/ruby/Md.snippet
deleted file mode 100755
index 1c2c9f1..0000000
--- a/vim/snippets/ruby/Md.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.open(${1:dump_path}, "wb") { |${2:file}| Marshal.dump(${3:obj}, ${4:$2}) }
diff --git a/vim/snippets/ruby/Ml.snippet b/vim/snippets/ruby/Ml.snippet
deleted file mode 100755
index 33c3200..0000000
--- a/vim/snippets/ruby/Ml.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.open(${1:dump_path}, "rb") { |${2:file}| Marshal.load(${3:$2}) }
diff --git a/vim/snippets/ruby/Pn.snippet b/vim/snippets/ruby/Pn.snippet
deleted file mode 100755
index e213691..0000000
--- a/vim/snippets/ruby/Pn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-PStore.new(${1})
diff --git a/vim/snippets/ruby/Yd-.snippet b/vim/snippets/ruby/Yd-.snippet
deleted file mode 100755
index e667a08..0000000
--- a/vim/snippets/ruby/Yd-.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.open(${1:path_to_yml}, "w") { |${2:file}| YAML.dump(${3:obj}, ${4:$2}) }
diff --git a/vim/snippets/ruby/Yd.snippet b/vim/snippets/ruby/Yd.snippet
deleted file mode 100755
index e667a08..0000000
--- a/vim/snippets/ruby/Yd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.open(${1:path_to_yml}, "w") { |${2:file}| YAML.dump(${3:obj}, ${4:$2}) }
diff --git a/vim/snippets/ruby/Yl-.snippet b/vim/snippets/ruby/Yl-.snippet
deleted file mode 100755
index b37d1bb..0000000
--- a/vim/snippets/ruby/Yl-.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.open(${1:path_to_yml}) { |${2:file}| YAML.load(${3:$2}) }
diff --git a/vim/snippets/ruby/Yl.snippet b/vim/snippets/ruby/Yl.snippet
deleted file mode 100755
index b37d1bb..0000000
--- a/vim/snippets/ruby/Yl.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.open(${1:path_to_yml}) { |${2:file}| YAML.load(${3:$2}) }
diff --git a/vim/snippets/ruby/am.snippet b/vim/snippets/ruby/am.snippet
deleted file mode 100755
index 88a7bc4..0000000
--- a/vim/snippets/ruby/am.snippet
+++ /dev/null
@@ -1 +0,0 @@
-alias :${1:new_name} :${2:old_name}
diff --git a/vim/snippets/ruby/anr.snippet b/vim/snippets/ruby/anr.snippet
deleted file mode 100644
index 633d432..0000000
--- a/vim/snippets/ruby/anr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_nothing_raised(${1:Exception}) { ${2} }
diff --git a/vim/snippets/ruby/as.snippet b/vim/snippets/ruby/as.snippet
deleted file mode 100755
index a8c7f5c..0000000
--- a/vim/snippets/ruby/as.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert ${1:test}, "${2:failure_message}"
diff --git a/vim/snippets/ruby/asam.snippet b/vim/snippets/ruby/asam.snippet
deleted file mode 100755
index 3c95b31..0000000
--- a/vim/snippets/ruby/asam.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_alias_method ${1:object}, ${2:alias_name}, ${3:original_name}
diff --git a/vim/snippets/ruby/asb.snippet b/vim/snippets/ruby/asb.snippet
deleted file mode 100755
index ab1eff7..0000000
--- a/vim/snippets/ruby/asb.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_boolean ${1:actual}
diff --git a/vim/snippets/ruby/asc.snippet b/vim/snippets/ruby/asc.snippet
deleted file mode 100755
index c6badc3..0000000
--- a/vim/snippets/ruby/asc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_compare ${1:expected}, ${2:operator}, ${3:actual}
diff --git a/vim/snippets/ruby/ascd.snippet b/vim/snippets/ruby/ascd.snippet
deleted file mode 100755
index bc77908..0000000
--- a/vim/snippets/ruby/ascd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_const_defined ${1:object}, ${2:constant_name}
diff --git a/vim/snippets/ruby/ase.snippet b/vim/snippets/ruby/ase.snippet
deleted file mode 100755
index 5f65099..0000000
--- a/vim/snippets/ruby/ase.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal ${1:expected}, ${2:actual}
diff --git a/vim/snippets/ruby/asem.snippet b/vim/snippets/ruby/asem.snippet
deleted file mode 100755
index 4642832..0000000
--- a/vim/snippets/ruby/asem.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_empty ${1:object}
diff --git a/vim/snippets/ruby/asf.snippet b/vim/snippets/ruby/asf.snippet
deleted file mode 100755
index 27ff6da..0000000
--- a/vim/snippets/ruby/asf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_false ${1:actual}
diff --git a/vim/snippets/ruby/asfa.snippet b/vim/snippets/ruby/asfa.snippet
deleted file mode 100755
index f45fa53..0000000
--- a/vim/snippets/ruby/asfa.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_fail_assertion { ${1:block} }
diff --git a/vim/snippets/ruby/asi.snippet b/vim/snippets/ruby/asi.snippet
deleted file mode 100755
index dedf94d..0000000
--- a/vim/snippets/ruby/asi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_include ${1:collection}, ${2:object}
diff --git a/vim/snippets/ruby/asid.snippet b/vim/snippets/ruby/asid.snippet
deleted file mode 100755
index 683fb06..0000000
--- a/vim/snippets/ruby/asid.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:delta_float}
diff --git a/vim/snippets/ruby/asie.snippet b/vim/snippets/ruby/asie.snippet
deleted file mode 100755
index f13d0a3..0000000
--- a/vim/snippets/ruby/asie.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_in_epsilon ${1:expected_float}, ${2:actual_float}
diff --git a/vim/snippets/ruby/asio.snippet b/vim/snippets/ruby/asio.snippet
deleted file mode 100755
index 56f0ab7..0000000
--- a/vim/snippets/ruby/asio.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}
diff --git a/vim/snippets/ruby/asko.snippet b/vim/snippets/ruby/asko.snippet
deleted file mode 100755
index 555bf13..0000000
--- a/vim/snippets/ruby/asko.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}
diff --git a/vim/snippets/ruby/asm.snippet b/vim/snippets/ruby/asm.snippet
deleted file mode 100755
index 9860b4c..0000000
--- a/vim/snippets/ruby/asm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_match /${1:expected_pattern}/, ${2:actual_string}
diff --git a/vim/snippets/ruby/asn.snippet b/vim/snippets/ruby/asn.snippet
deleted file mode 100755
index 36a2898..0000000
--- a/vim/snippets/ruby/asn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_nil ${1:instance}
diff --git a/vim/snippets/ruby/asncd.snippet b/vim/snippets/ruby/asncd.snippet
deleted file mode 100755
index b4dcd73..0000000
--- a/vim/snippets/ruby/asncd.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_const_defined ${1:object}, ${2:constant_name}
diff --git a/vim/snippets/ruby/asne.snippet b/vim/snippets/ruby/asne.snippet
deleted file mode 100755
index 91db286..0000000
--- a/vim/snippets/ruby/asne.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_equal ${1:unexpected}, ${2:actual}
diff --git a/vim/snippets/ruby/asnem.snippet b/vim/snippets/ruby/asnem.snippet
deleted file mode 100755
index 43d0772..0000000
--- a/vim/snippets/ruby/asnem.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_empty ${1:object}
diff --git a/vim/snippets/ruby/asni.snippet b/vim/snippets/ruby/asni.snippet
deleted file mode 100755
index d450d9e..0000000
--- a/vim/snippets/ruby/asni.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_include ${1:collection}, ${2:object}
diff --git a/vim/snippets/ruby/asnid.snippet b/vim/snippets/ruby/asnid.snippet
deleted file mode 100755
index 23e039a..0000000
--- a/vim/snippets/ruby/asnid.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_in_delta ${1:expected_float}, ${2:actual_float}
diff --git a/vim/snippets/ruby/asnie.snippet b/vim/snippets/ruby/asnie.snippet
deleted file mode 100755
index 25eb751..0000000
--- a/vim/snippets/ruby/asnie.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_in_epsilon ${1:expected_float}, ${2:actual_float}
diff --git a/vim/snippets/ruby/asnm.snippet b/vim/snippets/ruby/asnm.snippet
deleted file mode 100755
index 95dbf24..0000000
--- a/vim/snippets/ruby/asnm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_no_match /${1:unexpected_pattern}/, ${2:actual_string}
diff --git a/vim/snippets/ruby/asnn.snippet b/vim/snippets/ruby/asnn.snippet
deleted file mode 100755
index 9227bc8..0000000
--- a/vim/snippets/ruby/asnn.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_nil ${1:instance}
diff --git a/vim/snippets/ruby/asnp.snippet b/vim/snippets/ruby/asnp.snippet
deleted file mode 100755
index a540f84..0000000
--- a/vim/snippets/ruby/asnp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_predicate ${1:object}, ${2:predicate}
diff --git a/vim/snippets/ruby/asnr.snippet b/vim/snippets/ruby/asnr.snippet
deleted file mode 100755
index fc9a820..0000000
--- a/vim/snippets/ruby/asnr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_nothing_raised { ${1:block} }
diff --git a/vim/snippets/ruby/asnrt.snippet b/vim/snippets/ruby/asnrt.snippet
deleted file mode 100755
index fb063d2..0000000
--- a/vim/snippets/ruby/asnrt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_respond_to ${1:object}, ${2:method}
diff --git a/vim/snippets/ruby/asns.snippet b/vim/snippets/ruby/asns.snippet
deleted file mode 100755
index 509e467..0000000
--- a/vim/snippets/ruby/asns.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_same ${1:unexpected}, ${2:actual}
diff --git a/vim/snippets/ruby/asnse.snippet b/vim/snippets/ruby/asnse.snippet
deleted file mode 100755
index befde12..0000000
--- a/vim/snippets/ruby/asnse.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_not_send ${1:send_array}
diff --git a/vim/snippets/ruby/asnt.snippet b/vim/snippets/ruby/asnt.snippet
deleted file mode 100755
index cb633c2..0000000
--- a/vim/snippets/ruby/asnt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_nothing_thrown { ${1} }
diff --git a/vim/snippets/ruby/aso.snippet b/vim/snippets/ruby/aso.snippet
deleted file mode 100755
index 5b7faf6..0000000
--- a/vim/snippets/ruby/aso.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_operator ${1:left}, :${2:operator}, ${3:right}
diff --git a/vim/snippets/ruby/asp.snippet b/vim/snippets/ruby/asp.snippet
deleted file mode 100755
index c23fd3f..0000000
--- a/vim/snippets/ruby/asp.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_predicate ${1:object}, ${2:predicate}
diff --git a/vim/snippets/ruby/aspe.snippet b/vim/snippets/ruby/aspe.snippet
deleted file mode 100755
index 3a3eed4..0000000
--- a/vim/snippets/ruby/aspe.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_path_exist ${1:path}
diff --git a/vim/snippets/ruby/aspne.snippet b/vim/snippets/ruby/aspne.snippet
deleted file mode 100755
index f7a8873..0000000
--- a/vim/snippets/ruby/aspne.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_path_not_exist ${1:path}
diff --git a/vim/snippets/ruby/asr.snippet b/vim/snippets/ruby/asr.snippet
deleted file mode 100755
index 834038d..0000000
--- a/vim/snippets/ruby/asr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_raise(${1:Exception}) { ${2} }
diff --git a/vim/snippets/ruby/asrko.snippet b/vim/snippets/ruby/asrko.snippet
deleted file mode 100755
index f82820e..0000000
--- a/vim/snippets/ruby/asrko.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_raise_kind_of(${1:kinds...}) { ${2:block} }
diff --git a/vim/snippets/ruby/asrm.snippet b/vim/snippets/ruby/asrm.snippet
deleted file mode 100755
index f62f208..0000000
--- a/vim/snippets/ruby/asrm.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_raise_message ${1:expected_message}
diff --git a/vim/snippets/ruby/asrt.snippet b/vim/snippets/ruby/asrt.snippet
deleted file mode 100755
index ca8e84b..0000000
--- a/vim/snippets/ruby/asrt.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_respond_to ${1:object}, :${2:method}
diff --git a/vim/snippets/ruby/ass.snippet b/vim/snippets/ruby/ass.snippet
deleted file mode 100644
index 923e90d..0000000
--- a/vim/snippets/ruby/ass.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_send [${1:object}, :${2:message}, ${3:args}]
diff --git a/vim/snippets/ruby/asse.snippet b/vim/snippets/ruby/asse.snippet
deleted file mode 100755
index 4fb9ef9..0000000
--- a/vim/snippets/ruby/asse.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_send ${1:send_array}
diff --git a/vim/snippets/ruby/ast.snippet b/vim/snippets/ruby/ast.snippet
deleted file mode 100755
index 8962cfb..0000000
--- a/vim/snippets/ruby/ast.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_throws(:${1:expected}) { ${2} }
diff --git a/vim/snippets/ruby/astr.snippet b/vim/snippets/ruby/astr.snippet
deleted file mode 100755
index b9d14f6..0000000
--- a/vim/snippets/ruby/astr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-assert_true ${1:actual}
diff --git a/vim/snippets/ruby/begin.snippet b/vim/snippets/ruby/begin.snippet
deleted file mode 100755
index d0d2ca3..0000000
--- a/vim/snippets/ruby/begin.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-begin
-  ${1}
-rescue ${2:Exception} => ${3:e"}
-  ${4}
-end
-${5}
diff --git a/vim/snippets/ruby/begine.snippet b/vim/snippets/ruby/begine.snippet
deleted file mode 100755
index f82f5e1..0000000
--- a/vim/snippets/ruby/begine.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-begin
-  ${1}
-rescue ${2:Exception} => ${3:e"}
-  ${4}
-ensure
-  ${5}
-end
-${6}
diff --git a/vim/snippets/ruby/bm.snippet b/vim/snippets/ruby/bm.snippet
deleted file mode 100755
index 681c562..0000000
--- a/vim/snippets/ruby/bm.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-TESTS = ${1:10_000}
-Benchmark.bmbm do |results|
-	${2}
-end
diff --git a/vim/snippets/ruby/case.snippet b/vim/snippets/ruby/case.snippet
deleted file mode 100755
index 922dd6a..0000000
--- a/vim/snippets/ruby/case.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${1:object}
-when ${2:condition}
-else
-	${3}
-end
diff --git a/vim/snippets/ruby/cla/class ... end.snippet b/vim/snippets/ruby/cla/class ... end.snippet
deleted file mode 100755
index cb39670..0000000
--- a/vim/snippets/ruby/cla/class ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:`Snippet_RubyClassNameFromFilename()`}${2}
-	${3}
-end
diff --git a/vim/snippets/ruby/cla/class ... initialize ... end.snippet b/vim/snippets/ruby/cla/class ... initialize ... end.snippet
deleted file mode 100755
index 3d51340..0000000
--- a/vim/snippets/ruby/cla/class ... initialize ... end.snippet	
+++ /dev/null
@@ -1,5 +0,0 @@
-class ${1:`Snippet_RubyClassNameFromFilename()`}
-	def initialize${2}
-		${3}
-	end
-end
diff --git a/vim/snippets/ruby/class.snippet b/vim/snippets/ruby/class.snippet
deleted file mode 100755
index cb39670..0000000
--- a/vim/snippets/ruby/class.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-class ${1:`Snippet_RubyClassNameFromFilename()`}${2}
-	${3}
-end
diff --git a/vim/snippets/ruby/classe.snippet b/vim/snippets/ruby/classe.snippet
deleted file mode 100755
index f683c68..0000000
--- a/vim/snippets/ruby/classe.snippet
+++ /dev/null
@@ -1 +0,0 @@
-class ${1:ErrorClassName} < ${2:StandardError}; end${3}
diff --git a/vim/snippets/ruby/col.snippet b/vim/snippets/ruby/col.snippet
deleted file mode 100755
index 9f7cb8b..0000000
--- a/vim/snippets/ruby/col.snippet
+++ /dev/null
@@ -1 +0,0 @@
-collect { |${1:e}| ${2} }
diff --git a/vim/snippets/ruby/coldo.snippet b/vim/snippets/ruby/coldo.snippet
deleted file mode 100755
index 7d4e923..0000000
--- a/vim/snippets/ruby/coldo.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-collect do |${1:e}| 
-  ${2}
-end
-
diff --git a/vim/snippets/ruby/deec.snippet b/vim/snippets/ruby/deec.snippet
deleted file mode 100755
index 3248094..0000000
--- a/vim/snippets/ruby/deec.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Marshal.load(Marshal.dump(${1:obj_to_copy}))
diff --git a/vim/snippets/ruby/def.snippet b/vim/snippets/ruby/def.snippet
deleted file mode 100755
index 4e96130..0000000
--- a/vim/snippets/ruby/def.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def ${1:method}
-	${2}
-end
diff --git a/vim/snippets/ruby/defi.snippet b/vim/snippets/ruby/defi.snippet
deleted file mode 100755
index 12c354c..0000000
--- a/vim/snippets/ruby/defi.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def initialize${1}
-	${2}
-end
diff --git a/vim/snippets/ruby/defmm.snippet b/vim/snippets/ruby/defmm.snippet
deleted file mode 100755
index 5095226..0000000
--- a/vim/snippets/ruby/defmm.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def method_missing(method, *args, &block)
-	${1}
-end
diff --git a/vim/snippets/ruby/defs.snippet b/vim/snippets/ruby/defs.snippet
deleted file mode 100755
index 837733f..0000000
--- a/vim/snippets/ruby/defs.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def self.${1:class_method_name}
-	${2}
-end
diff --git a/vim/snippets/ruby/deft.snippet b/vim/snippets/ruby/deft.snippet
deleted file mode 100755
index 9c2adbf..0000000
--- a/vim/snippets/ruby/deft.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def test_${1:case_name}
-	${2}
-end
diff --git a/vim/snippets/ruby/del/delete_if do ... end.snippet b/vim/snippets/ruby/del/delete_if do ... end.snippet
deleted file mode 100755
index 17d70f3..0000000
--- a/vim/snippets/ruby/del/delete_if do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-delete_if do |${1:elements}|
-	${2}
-end
diff --git a/vim/snippets/ruby/del/delete_if { ... }.snippet b/vim/snippets/ruby/del/delete_if { ... }.snippet
deleted file mode 100755
index b7661d6..0000000
--- a/vim/snippets/ruby/del/delete_if { ... }.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-delete_if { |${1:e}| ${2} }
-${2}
diff --git a/vim/snippets/ruby/delt.snippit b/vim/snippets/ruby/delt.snippit
deleted file mode 100755
index 498db1a..0000000
--- a/vim/snippets/ruby/delt.snippit
+++ /dev/null
@@ -1 +0,0 @@
-delegate :${1:method}, to: :${2:object}
diff --git a/vim/snippets/ruby/det/detect do ... end.snippet b/vim/snippets/ruby/det/detect do ... end.snippet
deleted file mode 100755
index c2eedb3..0000000
--- a/vim/snippets/ruby/det/detect do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-detect do |${1:element}|
-	${2}
-end
diff --git a/vim/snippets/ruby/det/detect { ... }.snippet b/vim/snippets/ruby/det/detect { ... }.snippet
deleted file mode 100755
index b69bdca..0000000
--- a/vim/snippets/ruby/det/detect { ... }.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-detect { |${1:e}| ${2} }
-${3}
diff --git a/vim/snippets/ruby/detect.snippet b/vim/snippets/ruby/detect.snippet
deleted file mode 100755
index 5fc24aa..0000000
--- a/vim/snippets/ruby/detect.snippet
+++ /dev/null
@@ -1 +0,0 @@
-detect { |${1:element}| ${2:body} }
diff --git a/vim/snippets/ruby/detecto.snippet b/vim/snippets/ruby/detecto.snippet
deleted file mode 100755
index 904b2a6..0000000
--- a/vim/snippets/ruby/detecto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-detect do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/dglob.snippet b/vim/snippets/ruby/dglob.snippet
deleted file mode 100755
index 1b834f1..0000000
--- a/vim/snippets/ruby/dglob.snippet
+++ /dev/null
@@ -1 +0,0 @@
-Dir.glob(${1:"<+dir+>"}) { |<+file+>| <++> }
diff --git a/vim/snippets/ruby/do.snippet b/vim/snippets/ruby/do.snippet
deleted file mode 100755
index 596c11a..0000000
--- a/vim/snippets/ruby/do.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-do
-	${1}
-end
diff --git a/vim/snippets/ruby/dop.snippet b/vim/snippets/ruby/dop.snippet
deleted file mode 100755
index 9bf1898..0000000
--- a/vim/snippets/ruby/dop.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-do |${1:param}|
-	${2}
-end
diff --git a/vim/snippets/ruby/ea.snippet b/vim/snippets/ruby/ea.snippet
deleted file mode 100755
index 5f7edec..0000000
--- a/vim/snippets/ruby/ea.snippet
+++ /dev/null
@@ -1 +0,0 @@
-each { |${1:element}| ${2:body} }
diff --git a/vim/snippets/ruby/ea/each do ... end.snippet b/vim/snippets/ruby/ea/each do ... end.snippet
deleted file mode 100755
index 2c623a7..0000000
--- a/vim/snippets/ruby/ea/each do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-each do |${1:elements}|
-	${2}
-end
diff --git a/vim/snippets/ruby/ea/each { ... }.snippet b/vim/snippets/ruby/ea/each { ... }.snippet
deleted file mode 100755
index 47a3a7a..0000000
--- a/vim/snippets/ruby/ea/each { ... }.snippet	
+++ /dev/null
@@ -1 +0,0 @@
-each { |${1:e}| ${2} }
diff --git a/vim/snippets/ruby/ea/each_with_index do ... end.snippet b/vim/snippets/ruby/ea/each_with_index do ... end.snippet
deleted file mode 100755
index 247b1be..0000000
--- a/vim/snippets/ruby/ea/each_with_index do ... end.snippet	
+++ /dev/null
@@ -1,4 +0,0 @@
-each_with_index do |${1:element}, ${2:i}|
-	${3}
-end
-
diff --git a/vim/snippets/ruby/ea/each_with_index { ... }.snippet b/vim/snippets/ruby/ea/each_with_index { ... }.snippet
deleted file mode 100755
index 2823179..0000000
--- a/vim/snippets/ruby/ea/each_with_index { ... }.snippet	
+++ /dev/null
@@ -1 +0,0 @@
-each_with_index { |${1:e}, ${2:i}| ${3} }
diff --git a/vim/snippets/ruby/eab.snippet b/vim/snippets/ruby/eab.snippet
deleted file mode 100755
index 12378e6..0000000
--- a/vim/snippets/ruby/eab.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-each_byte { |${1:b}| ${2:body} }${3}
-
diff --git a/vim/snippets/ruby/eac.snippet b/vim/snippets/ruby/eac.snippet
deleted file mode 100755
index bb41891..0000000
--- a/vim/snippets/ruby/eac.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-each_char { |${1:c}| ${2:body} }${3}
-
diff --git a/vim/snippets/ruby/each.snippet b/vim/snippets/ruby/each.snippet
deleted file mode 100755
index 7c13342..0000000
--- a/vim/snippets/ruby/each.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-each do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/each_with_index.snippet b/vim/snippets/ruby/each_with_index.snippet
deleted file mode 100755
index f4d3ef1..0000000
--- a/vim/snippets/ruby/each_with_index.snippet
+++ /dev/null
@@ -1 +0,0 @@
-each_with_index { |${1:element},${2:i}| ${3:} }
diff --git a/vim/snippets/ruby/each_with_indexo.snippet b/vim/snippets/ruby/each_with_indexo.snippet
deleted file mode 100755
index e4fb708..0000000
--- a/vim/snippets/ruby/each_with_indexo.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-each_with_index do |${1:element},${2:i}|
-	${3:body}
-end
-
diff --git a/vim/snippets/ruby/eacho.snippet b/vim/snippets/ruby/eacho.snippet
deleted file mode 100755
index 7c13342..0000000
--- a/vim/snippets/ruby/eacho.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-each do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/eado.snippet b/vim/snippets/ruby/eado.snippet
deleted file mode 100755
index 7c13342..0000000
--- a/vim/snippets/ruby/eado.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-each do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/eai.snippet b/vim/snippets/ruby/eai.snippet
deleted file mode 100755
index 2c02fed..0000000
--- a/vim/snippets/ruby/eai.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-each_index { |${1:i}| ${2:body} }${3}
-
diff --git a/vim/snippets/ruby/eak.snippet b/vim/snippets/ruby/eak.snippet
deleted file mode 100755
index ad04122..0000000
--- a/vim/snippets/ruby/eak.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-each_key { |${1:k}| ${2:body} }${3}
-
diff --git a/vim/snippets/ruby/eap.snippet b/vim/snippets/ruby/eap.snippet
deleted file mode 100755
index fb97583..0000000
--- a/vim/snippets/ruby/eap.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-each_pair { |${1:k}, ${2:v}| ${3:body} }${4}
-
diff --git a/vim/snippets/ruby/eav.snippet b/vim/snippets/ruby/eav.snippet
deleted file mode 100755
index 66cffa7..0000000
--- a/vim/snippets/ruby/eav.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-each_value { |${1:v}| ${2:body} }${3}
-
diff --git a/vim/snippets/ruby/eawi.snippet b/vim/snippets/ruby/eawi.snippet
deleted file mode 100755
index f4d3ef1..0000000
--- a/vim/snippets/ruby/eawi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-each_with_index { |${1:element},${2:i}| ${3:} }
diff --git a/vim/snippets/ruby/eawido.snippet b/vim/snippets/ruby/eawido.snippet
deleted file mode 100755
index e4fb708..0000000
--- a/vim/snippets/ruby/eawido.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-each_with_index do |${1:element},${2:i}|
-	${3:body}
-end
-
diff --git a/vim/snippets/ruby/elsif.snippet b/vim/snippets/ruby/elsif.snippet
deleted file mode 100755
index 84d8134..0000000
--- a/vim/snippets/ruby/elsif.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-elsif ${1:condition}
-	${2}
diff --git a/vim/snippets/ruby/fileeach.snippet b/vim/snippets/ruby/fileeach.snippet
deleted file mode 100755
index 01091a5..0000000
--- a/vim/snippets/ruby/fileeach.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.foreach(${1:"<+path+>"}) { |<+line+>| <++> }
diff --git a/vim/snippets/ruby/fopen.snippet b/vim/snippets/ruby/fopen.snippet
deleted file mode 100755
index eaabe72..0000000
--- a/vim/snippets/ruby/fopen.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-File.open(${1:filename}, '${2:rwab}') { |${3:file}| ${4} }
-${5}
diff --git a/vim/snippets/ruby/fread.snippet b/vim/snippets/ruby/fread.snippet
deleted file mode 100755
index d9e6074..0000000
--- a/vim/snippets/ruby/fread.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.read(${1})
diff --git a/vim/snippets/ruby/fwrite.snippet b/vim/snippets/ruby/fwrite.snippet
deleted file mode 100755
index 8fd729a..0000000
--- a/vim/snippets/ruby/fwrite.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-File.open(${1:filename}, '${2:w}') { |file| file << ${3:data} }
-${4}
diff --git a/vim/snippets/ruby/gem.snippet b/vim/snippets/ruby/gem.snippet
deleted file mode 100755
index 8ffc6a7..0000000
--- a/vim/snippets/ruby/gem.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-gem '${1:name}', '${2:version}'
-${3}
diff --git a/vim/snippets/ruby/http_get.snippet b/vim/snippets/ruby/http_get.snippet
deleted file mode 100755
index cba6d58..0000000
--- a/vim/snippets/ruby/http_get.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'net/http'
-res = Net::HTTP.get URI.parse('${1:url}')
diff --git a/vim/snippets/ruby/http_post.snippet b/vim/snippets/ruby/http_post.snippet
deleted file mode 100755
index 3b2036a..0000000
--- a/vim/snippets/ruby/http_post.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'net/http'
-res = Net::HTTP.post_form URI.parse('${1:url}')${2:, params}
diff --git a/vim/snippets/ruby/if.snippet b/vim/snippets/ruby/if.snippet
deleted file mode 100755
index b2d1e39..0000000
--- a/vim/snippets/ruby/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if ${1:condition}
-	${2}
-end
diff --git a/vim/snippets/ruby/ife.snippet b/vim/snippets/ruby/ife.snippet
deleted file mode 100755
index 6799290..0000000
--- a/vim/snippets/ruby/ife.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-if ${1:condition}
-	${2}
-else
-	${3}
-end
diff --git a/vim/snippets/ruby/init.snippet b/vim/snippets/ruby/init.snippet
deleted file mode 100755
index 12c354c..0000000
--- a/vim/snippets/ruby/init.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-def initialize${1}
-	${2}
-end
diff --git a/vim/snippets/ruby/inj.snippet b/vim/snippets/ruby/inj.snippet
deleted file mode 100755
index 90dea0d..0000000
--- a/vim/snippets/ruby/inj.snippet
+++ /dev/null
@@ -1 +0,0 @@
-inject(${1:init}) { |${2:total}, ${3:next}| ${4:body} }
diff --git a/vim/snippets/ruby/inj/inject do ... end.snippet b/vim/snippets/ruby/inj/inject do ... end.snippet
deleted file mode 100755
index 5d54a91..0000000
--- a/vim/snippets/ruby/inj/inject do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-inject(${1:{}}) do |${2:hash}, ${3:element}|
-	${4}
-end
diff --git a/vim/snippets/ruby/inj/inject { ... }.snippet b/vim/snippets/ruby/inj/inject { ... }.snippet
deleted file mode 100755
index 2dea26d..0000000
--- a/vim/snippets/ruby/inj/inject { ... }.snippet	
+++ /dev/null
@@ -1 +0,0 @@
-inject(${1:{}}) { |${2:hash}, ${3:e}| ${4} }
diff --git a/vim/snippets/ruby/injdo.snippet b/vim/snippets/ruby/injdo.snippet
deleted file mode 100755
index d3235e9..0000000
--- a/vim/snippets/ruby/injdo.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-inject(${1:init}) do |${2:total}, ${3:next}|
-	${4:body}
-end
diff --git a/vim/snippets/ruby/inject.snippet b/vim/snippets/ruby/inject.snippet
deleted file mode 100755
index 69735c9..0000000
--- a/vim/snippets/ruby/inject.snippet
+++ /dev/null
@@ -1 +0,0 @@
-inject(${1:[]}) { |${2:mem},${3:item}| ${4:body} }
diff --git a/vim/snippets/ruby/injecto.snippet b/vim/snippets/ruby/injecto.snippet
deleted file mode 100755
index 1631033..0000000
--- a/vim/snippets/ruby/injecto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-inject do |${1:total},${2:next}|
-	${3:body}
-end
diff --git a/vim/snippets/ruby/ip.snippet b/vim/snippets/ruby/ip.snippet
deleted file mode 100755
index 9176976..0000000
--- a/vim/snippets/ruby/ip.snippet
+++ /dev/null
@@ -1 +0,0 @@
-ip_addr = request.env['REMOTE_ADDR']
diff --git a/vim/snippets/ruby/log.snippet b/vim/snippets/ruby/log.snippet
deleted file mode 100755
index 2450948..0000000
--- a/vim/snippets/ruby/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-logger.debug "${1:message}"${2}
diff --git a/vim/snippets/ruby/map.snippet b/vim/snippets/ruby/map.snippet
deleted file mode 100755
index b3e7719..0000000
--- a/vim/snippets/ruby/map.snippet
+++ /dev/null
@@ -1 +0,0 @@
-map { |${1:element}| ${2:body} }
diff --git a/vim/snippets/ruby/map/map { ... }.snippet b/vim/snippets/ruby/map/map { ... }.snippet
deleted file mode 100755
index 987f34d..0000000
--- a/vim/snippets/ruby/map/map { ... }.snippet	
+++ /dev/null
@@ -1 +0,0 @@
-map { |${1:e}| ${2:body} }
diff --git a/vim/snippets/ruby/map/mapd do ... end.snippet b/vim/snippets/ruby/map/mapd do ... end.snippet
deleted file mode 100755
index b2ccde2..0000000
--- a/vim/snippets/ruby/map/mapd do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-map do |${1:element}|
-	${2}
-end
diff --git a/vim/snippets/ruby/mapdo.snippet b/vim/snippets/ruby/mapdo.snippet
deleted file mode 100755
index 316e7c7..0000000
--- a/vim/snippets/ruby/mapdo.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-map do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/mapo.snippet b/vim/snippets/ruby/mapo.snippet
deleted file mode 100755
index 316e7c7..0000000
--- a/vim/snippets/ruby/mapo.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-map do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/mod.snippet b/vim/snippets/ruby/mod.snippet
deleted file mode 100755
index 457fd61..0000000
--- a/vim/snippets/ruby/mod.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-module ${1:`Snippet_RubyClassNameFromFilename()`}
-	${2}
-end
diff --git a/vim/snippets/ruby/mod/module ... ClassMethods ... end.snippet b/vim/snippets/ruby/mod/module ... ClassMethods ... end.snippet
deleted file mode 100755
index 6e00c92..0000000
--- a/vim/snippets/ruby/mod/module ... ClassMethods ... end.snippet	
+++ /dev/null
@@ -1,13 +0,0 @@
-module ${1:`Snippet_RubyClassNameFromFilename()`}
-	def self.included(base)
-		base.extend ClassMethods
-	end
-
-	def ${2:instance_method}
-		${3}
-	end
-
-	module ClassMethods
-
-	end
-end
diff --git a/vim/snippets/ruby/mod/module ... end.snippet b/vim/snippets/ruby/mod/module ... end.snippet
deleted file mode 100755
index 457fd61..0000000
--- a/vim/snippets/ruby/mod/module ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-module ${1:`Snippet_RubyClassNameFromFilename()`}
-	${2}
-end
diff --git a/vim/snippets/ruby/module.snippet b/vim/snippets/ruby/module.snippet
deleted file mode 100755
index 690a0f4..0000000
--- a/vim/snippets/ruby/module.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-module ${1:`Snippet_RubyClassNameFromFilename()`}
-
-end
diff --git a/vim/snippets/ruby/nam.snippet b/vim/snippets/ruby/nam.snippet
deleted file mode 100755
index 19b90a7..0000000
--- a/vim/snippets/ruby/nam.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace :${1:namespace} do
-	${2}
-end
diff --git a/vim/snippets/ruby/ope.snippet b/vim/snippets/ruby/ope.snippet
deleted file mode 100755
index cfe9247..0000000
--- a/vim/snippets/ruby/ope.snippet
+++ /dev/null
@@ -1 +0,0 @@
-open(${1:path}, "${2:rwab}") { |${3:io}| ${4} }
diff --git a/vim/snippets/ruby/pathhere.snippet b/vim/snippets/ruby/pathhere.snippet
deleted file mode 100755
index f4ed944..0000000
--- a/vim/snippets/ruby/pathhere.snippet
+++ /dev/null
@@ -1 +0,0 @@
-File.join(File.dirname(__FILE__), *%w[${1:rel_path_here}])
diff --git a/vim/snippets/ruby/r.snippet b/vim/snippets/ruby/r.snippet
deleted file mode 100755
index f232fc9..0000000
--- a/vim/snippets/ruby/r.snippet
+++ /dev/null
@@ -1 +0,0 @@
-attr_reader :${1:attr_names}
diff --git a/vim/snippets/ruby/rej/reject do ... end.snippet b/vim/snippets/ruby/rej/reject do ... end.snippet
deleted file mode 100755
index 1e3ca7b..0000000
--- a/vim/snippets/ruby/rej/reject do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-reject do |${1:element}|
-	${2}
-end
diff --git a/vim/snippets/ruby/rej/reject { ... }.snippet b/vim/snippets/ruby/rej/reject { ... }.snippet
deleted file mode 100755
index 03ac987..0000000
--- a/vim/snippets/ruby/rej/reject { ... }.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-reject { |${1:e}| ${2} }
-${3}
diff --git a/vim/snippets/ruby/reject.snippet b/vim/snippets/ruby/reject.snippet
deleted file mode 100755
index 07d2787..0000000
--- a/vim/snippets/ruby/reject.snippet
+++ /dev/null
@@ -1 +0,0 @@
-reject { |${1:element}| ${2:body} }
diff --git a/vim/snippets/ruby/rejecto.snippet b/vim/snippets/ruby/rejecto.snippet
deleted file mode 100755
index e906bd7..0000000
--- a/vim/snippets/ruby/rejecto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-reject do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/rep.snippet b/vim/snippets/ruby/rep.snippet
deleted file mode 100755
index 04b77b0..0000000
--- a/vim/snippets/ruby/rep.snippet
+++ /dev/null
@@ -1 +0,0 @@
-results.report("${1:name}:") { TESTS.times { ${2} } }
diff --git a/vim/snippets/ruby/report.snippet b/vim/snippets/ruby/report.snippet
deleted file mode 100755
index 04b77b0..0000000
--- a/vim/snippets/ruby/report.snippet
+++ /dev/null
@@ -1 +0,0 @@
-results.report("${1:name}:") { TESTS.times { ${2} } }
diff --git a/vim/snippets/ruby/req.snippet b/vim/snippets/ruby/req.snippet
deleted file mode 100755
index d086457..0000000
--- a/vim/snippets/ruby/req.snippet
+++ /dev/null
@@ -1 +0,0 @@
-require "${1}"
diff --git a/vim/snippets/ruby/reqf.snippet b/vim/snippets/ruby/reqf.snippet
deleted file mode 100755
index 657d020..0000000
--- a/vim/snippets/ruby/reqf.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.expand_path('../${1:filename}', __FILE__)
-${2}
diff --git a/vim/snippets/ruby/rw.snippet b/vim/snippets/ruby/rw.snippet
deleted file mode 100755
index 1862da3..0000000
--- a/vim/snippets/ruby/rw.snippet
+++ /dev/null
@@ -1 +0,0 @@
-attr_accessor :${1:attr_names}
diff --git a/vim/snippets/ruby/sel/select do ... end.snippet b/vim/snippets/ruby/sel/select do ... end.snippet
deleted file mode 100755
index c08755a..0000000
--- a/vim/snippets/ruby/sel/select do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-select do |${1:element}|
-	${2}
-end
diff --git a/vim/snippets/ruby/sel/select { ... }.snippet b/vim/snippets/ruby/sel/select { ... }.snippet
deleted file mode 100755
index b0e2666..0000000
--- a/vim/snippets/ruby/sel/select { ... }.snippet	
+++ /dev/null
@@ -1,2 +0,0 @@
-select { |${1:e}| ${2} }
-${3}
diff --git a/vim/snippets/ruby/select.snippet b/vim/snippets/ruby/select.snippet
deleted file mode 100755
index 8ab228c..0000000
--- a/vim/snippets/ruby/select.snippet
+++ /dev/null
@@ -1 +0,0 @@
-select { |${1:element}| ${2:body} }
diff --git a/vim/snippets/ruby/selecto.snippet b/vim/snippets/ruby/selecto.snippet
deleted file mode 100755
index a22a650..0000000
--- a/vim/snippets/ruby/selecto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-select do |${1:element}|
-	${2:body}
-end
diff --git a/vim/snippets/ruby/sinc.snippet b/vim/snippets/ruby/sinc.snippet
deleted file mode 100755
index 20e2c4c..0000000
--- a/vim/snippets/ruby/sinc.snippet
+++ /dev/null
@@ -1 +0,0 @@
-class << self; self end
diff --git a/vim/snippets/ruby/sor/sort do ... end.snippet b/vim/snippets/ruby/sor/sort do ... end.snippet
deleted file mode 100755
index ba7009e..0000000
--- a/vim/snippets/ruby/sor/sort do ... end.snippet	
+++ /dev/null
@@ -1,3 +0,0 @@
-sort do |${1:x},${2:y}|
-	${3}
-end
diff --git a/vim/snippets/ruby/sor/sort { ... }.snippet b/vim/snippets/ruby/sor/sort { ... }.snippet
deleted file mode 100755
index c642a15..0000000
--- a/vim/snippets/ruby/sor/sort { ... }.snippet	
+++ /dev/null
@@ -1 +0,0 @@
-sort { |${1:x},${2:y}| ${3} }
diff --git a/vim/snippets/ruby/sort.snippet b/vim/snippets/ruby/sort.snippet
deleted file mode 100755
index 08a67c1..0000000
--- a/vim/snippets/ruby/sort.snippet
+++ /dev/null
@@ -1 +0,0 @@
-sort { |${1:x},${2:y}| ${3:body} }
diff --git a/vim/snippets/ruby/sorto.snippet b/vim/snippets/ruby/sorto.snippet
deleted file mode 100755
index 76c38e4..0000000
--- a/vim/snippets/ruby/sorto.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-sort do |${1:x},${2:y}|
-	${3:body}
-end
diff --git a/vim/snippets/ruby/tas.snippet b/vim/snippets/ruby/tas.snippet
deleted file mode 100755
index d949a6b..0000000
--- a/vim/snippets/ruby/tas.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-desc "${1:Task description}"
-task :${2:task_name}${3: => [:dependent, :tasks]} do
-	${4}
-end
diff --git a/vim/snippets/ruby/task.snippet b/vim/snippets/ruby/task.snippet
deleted file mode 100755
index 5477a7e..0000000
--- a/vim/snippets/ruby/task.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-desc '${1:Task description}'
-task ${2:task_name}${3: ['dependent:task', 'other:task2']} do
-	${4}
-end
diff --git a/vim/snippets/ruby/tc.snippet b/vim/snippets/ruby/tc.snippet
deleted file mode 100755
index 3e28f61..0000000
--- a/vim/snippets/ruby/tc.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-require "test/unit"
-
-require "${1:library_file_name}"
-
-class Test${2:`Snippet_RubyClassNameFromFilename()`} < Test::Unit::TestCase
-	def test_${3:case_name}
-		${4}
-	end
-end
diff --git a/vim/snippets/ruby/unless.snippet b/vim/snippets/ruby/unless.snippet
deleted file mode 100755
index 3495d2b..0000000
--- a/vim/snippets/ruby/unless.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-unless ${1:condition}
-	${2}
-end
diff --git a/vim/snippets/ruby/unlesse.snippet b/vim/snippets/ruby/unlesse.snippet
deleted file mode 100755
index d190b45..0000000
--- a/vim/snippets/ruby/unlesse.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-unless ${1:condition}
-	${2}
-else
-end
diff --git a/vim/snippets/ruby/until.snippet b/vim/snippets/ruby/until.snippet
deleted file mode 100755
index d5518b8..0000000
--- a/vim/snippets/ruby/until.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-until ${1:condition}
-	${2}
-end
diff --git a/vim/snippets/ruby/w.snippet b/vim/snippets/ruby/w.snippet
deleted file mode 100755
index 0650e95..0000000
--- a/vim/snippets/ruby/w.snippet
+++ /dev/null
@@ -1 +0,0 @@
-attr_writer :${1:attr_names}
diff --git a/vim/snippets/ruby/when.snippet b/vim/snippets/ruby/when.snippet
deleted file mode 100755
index 91cf1eb..0000000
--- a/vim/snippets/ruby/when.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-when ${1:condition}
-	${2}
diff --git a/vim/snippets/ruby/while.snippet b/vim/snippets/ruby/while.snippet
deleted file mode 100755
index 6e878fa..0000000
--- a/vim/snippets/ruby/while.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-while ${1:condition}
-	${2}
-end
diff --git a/vim/snippets/ruby/xmlr.snippet b/vim/snippets/ruby/xmlr.snippet
deleted file mode 100755
index eeb3580..0000000
--- a/vim/snippets/ruby/xmlr.snippet
+++ /dev/null
@@ -1 +0,0 @@
-REXML::Document.new(File.read(${1:path}))
diff --git a/vim/snippets/ruby/xpa.snippet b/vim/snippets/ruby/xpa.snippet
deleted file mode 100755
index 5bff950..0000000
--- a/vim/snippets/ruby/xpa.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-elements.each(${1}) do |${2:node}|
-	${3}
-end
diff --git a/vim/snippets/ruby/zip.snippet b/vim/snippets/ruby/zip.snippet
deleted file mode 100755
index b2c831a..0000000
--- a/vim/snippets/ruby/zip.snippet
+++ /dev/null
@@ -1 +0,0 @@
-zip(${1:enums}) { |${2:row}| ${3} }
diff --git a/vim/snippets/sh/#!.snippet b/vim/snippets/sh/#!.snippet
deleted file mode 100755
index a9bf588..0000000
--- a/vim/snippets/sh/#!.snippet
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/bash
diff --git a/vim/snippets/sh/$#.snippet b/vim/snippets/sh/$#.snippet
deleted file mode 100755
index 5cc5ff7..0000000
--- a/vim/snippets/sh/$#.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ $# -lt 1 ]; then
-	echo "${1:#missing arguments}"
-	exit 1
-else
-	${2:#action}
-fi
diff --git a/vim/snippets/sh/arr.snippet b/vim/snippets/sh/arr.snippet
deleted file mode 100755
index e69de29..0000000
diff --git a/vim/snippets/sh/arr/keyed.snippet b/vim/snippets/sh/arr/keyed.snippet
deleted file mode 100755
index bc438d6..0000000
--- a/vim/snippets/sh/arr/keyed.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-${1:array}[0]=${2:value}
-$1[1]=${3:value}
-$1[2]=${4:value}
-${5}
diff --git a/vim/snippets/sh/arr/list.snippet b/vim/snippets/sh/arr/list.snippet
deleted file mode 100755
index 060a6b2..0000000
--- a/vim/snippets/sh/arr/list.snippet
+++ /dev/null
@@ -1 +0,0 @@
-${1:array}=(${2:first} ${3:second} ${4}) ${5}
diff --git a/vim/snippets/sh/case.snippet b/vim/snippets/sh/case.snippet
deleted file mode 100755
index 2ba3cc8..0000000
--- a/vim/snippets/sh/case.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-case ${1:word} in
-	${2:pattern})
-	${3};;
-esac
diff --git a/vim/snippets/sh/date.snippet b/vim/snippets/sh/date.snippet
deleted file mode 100755
index bb38782..0000000
--- a/vim/snippets/sh/date.snippet
+++ /dev/null
@@ -1 +0,0 @@
-`system("date +%m-%d-%Y")`
diff --git a/vim/snippets/sh/elif.snippet b/vim/snippets/sh/elif.snippet
deleted file mode 100755
index 52d1a99..0000000
--- a/vim/snippets/sh/elif.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-elif [[ ${1:condition} ]]; then
-	${2:#statements}
diff --git a/vim/snippets/sh/for/c-style.snippet b/vim/snippets/sh/for/c-style.snippet
deleted file mode 100755
index fdac70d..0000000
--- a/vim/snippets/sh/for/c-style.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
-	${3:#statements}
-done
-
diff --git a/vim/snippets/sh/for/index-loop.snippet b/vim/snippets/sh/for/index-loop.snippet
deleted file mode 100755
index 18e4da0..0000000
--- a/vim/snippets/sh/for/index-loop.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-for ${1:i}  in ${!${2:Array}[@]}
-do
-	echo "${$2[$1]}"
-done
diff --git a/vim/snippets/sh/for/list.snippet b/vim/snippets/sh/for/list.snippet
deleted file mode 100755
index acffac4..0000000
--- a/vim/snippets/sh/for/list.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-for ${1:var} in $${2:list}; do
-	echo "$$1"
-done
diff --git a/vim/snippets/sh/for/numargs.snippet b/vim/snippets/sh/for/numargs.snippet
deleted file mode 100755
index 9cf0a01..0000000
--- a/vim/snippets/sh/for/numargs.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-numargs=$#
-for ((i=1 ; i <= numargs ; i++)); do
-	echo "$1"
-	shift
-done
diff --git a/vim/snippets/sh/for/times-sequence.snippet b/vim/snippets/sh/for/times-sequence.snippet
deleted file mode 100755
index 49237a6..0000000
--- a/vim/snippets/sh/for/times-sequence.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-for ${1:i} in {${2:1}..${3:10}}
-do
-	echo "$$1"
-done
diff --git a/vim/snippets/sh/fore.snippet b/vim/snippets/sh/fore.snippet
deleted file mode 100755
index 439cef4..0000000
--- a/vim/snippets/sh/fore.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-for ${2:i} in ${1:array}
-do
-    echo $2
-done
diff --git a/vim/snippets/sh/fun.snippet b/vim/snippets/sh/fun.snippet
deleted file mode 100755
index b1eefa5..0000000
--- a/vim/snippets/sh/fun.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-function ${1:name}(){
-  ${2:Commands}
-}
diff --git a/vim/snippets/sh/gt.snippet b/vim/snippets/sh/gt.snippet
deleted file mode 100755
index 33166cf..0000000
--- a/vim/snippets/sh/gt.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ ${1:$var} -gt ${2:$other} ]; then 
-	echo 'Greater than $2' 
-else 
-	echo 'Less than $2'
-fi
diff --git a/vim/snippets/sh/if.snippet b/vim/snippets/sh/if.snippet
deleted file mode 100755
index 06ebd60..0000000
--- a/vim/snippets/sh/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if [[ ${1:condition} ]]; then
-	${2:#statements}
-fi
diff --git a/vim/snippets/sh/ifdir.snippet b/vim/snippets/sh/ifdir.snippet
deleted file mode 100755
index c0ca9c2..0000000
--- a/vim/snippets/sh/ifdir.snippet
+++ /dev/null
@@ -1 +0,0 @@
-[ -d ${1:namedir} ] || mkdir $1 ; cd $1 
diff --git a/vim/snippets/sh/ife.snippet b/vim/snippets/sh/ife.snippet
deleted file mode 100755
index 4b7fb9b..0000000
--- a/vim/snippets/sh/ife.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ ${1:condition} ]]; then
-	${2:#statements}
-else
-	${3:#statements}
-fi
diff --git a/vim/snippets/sh/iffile.snippet b/vim/snippets/sh/iffile.snippet
deleted file mode 100755
index 1795d15..0000000
--- a/vim/snippets/sh/iffile.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ ! -e ${1:filename}  ]; then
-	echo "file $1 not present"
-fi
-
diff --git a/vim/snippets/sh/ifroot.snippet b/vim/snippets/sh/ifroot.snippet
deleted file mode 100755
index 4c5f6bb..0000000
--- a/vim/snippets/sh/ifroot.snippet
+++ /dev/null
@@ -1,7 +0,0 @@
-# Need to be logged in as root
-if [ "$(id -u)" != "0" ]; then
-	echo "  Need be root"
-	sleep 2
-	exit  1
-fi
-
diff --git a/vim/snippets/sh/lt.snippet b/vim/snippets/sh/lt.snippet
deleted file mode 100755
index 30d2c0b..0000000
--- a/vim/snippets/sh/lt.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ ${1:$var} -lt ${2:$other} ]; then 
-	echo 'Less than $2'
-else 
-	echo 'Greater than $2' 
-fi
diff --git a/vim/snippets/sh/sh.snippet b/vim/snippets/sh/sh.snippet
deleted file mode 100755
index f0c06e6..0000000
--- a/vim/snippets/sh/sh.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Created on: `system("date +%m-%d-%Y")`
-# Last Change: `system("date +%m-%d-%Y")`
-# vim:ft=sh:fdm=syntax:nu:
-# Description: ${1:description}
-# Author: ${2:`system("whoami")`}
-# Url: ${3:url}
-
diff --git a/vim/snippets/sh/usage.snippet b/vim/snippets/sh/usage.snippet
deleted file mode 100755
index 9774b49..0000000
--- a/vim/snippets/sh/usage.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-usage()
-{
-	echo "Usage: $(basename $${1:0}) ${2:argument}"
-	echo "${3:explanation}"
-}
diff --git a/vim/snippets/sh/while.snippet b/vim/snippets/sh/while.snippet
deleted file mode 100755
index 911a6a2..0000000
--- a/vim/snippets/sh/while.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-while [[ ${1:condition} ]]; do
-	${2:#statements}
-done
diff --git a/vim/snippets/sh/yesno/longer.snippet b/vim/snippets/sh/yesno/longer.snippet
deleted file mode 100755
index b024f43..0000000
--- a/vim/snippets/sh/yesno/longer.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-echo -n "Do you wish to ${1:#question}" '[y/n] ' ; read ${2:ans}
-case "$$2" in
-	y*|Y*) ${3:#statement} ;;
-	*) ${4:#statement};;
-esac
diff --git a/vim/snippets/sh/yesno/simple.snippet b/vim/snippets/sh/yesno/simple.snippet
deleted file mode 100755
index 3a6b0c2..0000000
--- a/vim/snippets/sh/yesno/simple.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-read ${1:yn}
-if [[ $$1 =~ [Yy] ]]; then
-	echo "${2:#statement}"
-else
-	echo "${3:#statement}"
-fi
diff --git a/vim/snippets/sinatra/get.snippet b/vim/snippets/sinatra/get.snippet
deleted file mode 100755
index 08f3fd5..0000000
--- a/vim/snippets/sinatra/get.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-get '${1:/}' do
-	${2}
-end
diff --git a/vim/snippets/sql/add.snippet b/vim/snippets/sql/add.snippet
deleted file mode 100755
index 0578ae2..0000000
--- a/vim/snippets/sql/add.snippet
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE \`${1:name}\` ADD COLUMN \`${2:column}\` ${3:type}${4: NOT NULL}${5: DEFAULT 0}${6: AUTO_INCREMENT} ${7:AFTER \`name`};
diff --git a/vim/snippets/sql/col.snippet b/vim/snippets/sql/col.snippet
deleted file mode 100755
index e859756..0000000
--- a/vim/snippets/sql/col.snippet
+++ /dev/null
@@ -1 +0,0 @@
-\`${1:name}\` ${2:type}${3: NOT NULL}${4: DEFAULT 0}${5:,}${6}
diff --git a/vim/snippets/sql/create.snippet b/vim/snippets/sql/create.snippet
deleted file mode 100755
index 3ebc25b..0000000
--- a/vim/snippets/sql/create.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP TABLE IF EXISTS \`${1:name}\`;
-CREATE TABLE \`$1\` (
-	\`${2:id}\` ${3:integer unsigned}${4: NOT NULL}${5: AUTO_INCREMENT}${6:,}${10}
-	${7:PRIMARY KEY (\`$2\`)}
-)  ENGINE=${8:MyISAM} DEFAULT CHARSET=${9:latin1};
diff --git a/vim/snippets/sql/drop.snippet b/vim/snippets/sql/drop.snippet
deleted file mode 100755
index 84441d3..0000000
--- a/vim/snippets/sql/drop.snippet
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE \`${1:name}\` DROP \`${2:column}\`;$3
diff --git a/vim/snippets/sql/index.snippet b/vim/snippets/sql/index.snippet
deleted file mode 100755
index 401d794..0000000
--- a/vim/snippets/sql/index.snippet
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE \`${1:name}\` ADD${2: UNIQUE} INDEX \`${3:column}\`(\`$3\`);$4
diff --git a/vim/snippets/sql/last4.snippet b/vim/snippets/sql/last4.snippet
deleted file mode 100755
index b98ef34..0000000
--- a/vim/snippets/sql/last4.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-\`creator_id\` integer unsigned NOT NULL DEFAULT '0',
-\`modifier_id\` integer unsigned NOT NULL DEFAULT '0',
-\`date_created\` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-\`date_modified\` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,${1}
diff --git a/vim/snippets/sql/rename.snippet b/vim/snippets/sql/rename.snippet
deleted file mode 100755
index 7046be5..0000000
--- a/vim/snippets/sql/rename.snippet
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE \`${1:table}\` CHANGE \`${2:old_name}\` \`${3:new_name}\` ${4:type}${5: NOT NULL}${6: DEFAULT 0}${7: AUTO_INCREMENT};${8}
diff --git a/vim/snippets/sshconfig/host.snippet b/vim/snippets/sshconfig/host.snippet
deleted file mode 100755
index 5992a2d..0000000
--- a/vim/snippets/sshconfig/host.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-Host ${1:name}
-    Hostname ${2:example.com}
-    User ${3:username}
diff --git a/vim/snippets/support_functions.vim b/vim/snippets/support_functions.vim
deleted file mode 100755
index a0bb69b..0000000
--- a/vim/snippets/support_functions.vim
+++ /dev/null
@@ -1,127 +0,0 @@
-"ruby {{{1
-function! Snippet_RubyClassNameFromFilename(...)
-    let name = expand("%:t:r")
-    if len(name) == 0
-        if a:0 == 0
-            let name = 'MyClass'
-        else
-            let name = a:1
-        endif
-    endif
-    return Snippet_Camelcase(substitute(name, '_spec$', '', ''))
-endfunction
-
-function! Snippet_RubySpecNameFromFilename(...)
-    let name = substitute(expand("%:t:r"), '_spec$', '', '')
-    if len(name) == 0
-        if a:0 == 0
-            let name = 'MyClass'
-        else
-            let name = a:1
-        endif
-    endif
-    return Snippet_Camelcase(name)
-endfunction
-
-function! Snippet_MigrationNameFromFilename(...)
-    let name = substitute(expand("%:t:r"), '^.\{-}_', '', '')
-    if len(name) == 0
-        if a:0 == 0
-            let name = 'MyClass'
-        else
-            let name = a:1
-        endif
-    endif
-    return Snippet_Camelcase(name)
-endfunction
-
-
-"python {{{1
-function! Snippet_PythonClassNameFromFilename(...)
-    let name = expand("%:t:r")
-    if len(name) == 0
-        if a:0 == 0
-            let name = 'MyClass'
-        else
-            let name = a:1
-        endif
-    endif
-    return Snippet_Camelcase(name)
-endfunction
-
-"php {{{1
-function! Snippet_PHPClassNameFromFilename(...)
-    let name = expand("%:t:r:r")
-    if len(name) == 0
-        if a:0 == 0
-            let name = 'MyClass'
-        else
-            let name = a:1
-        endif
-    endif
-    return name
-endfunction
-
-"java {{{1
-function! Snippet_JavaClassNameFromFilename(...)
-    let name = expand("%:t:r")
-    if len(name) == 0
-        if a:0 == 0
-            let name = 'MyClass'
-        else
-            let name = a:1
-        endif
-    endif
-    return name
-endfunction
-
-function! Snippet_JavaInstanceVarType(name)
-    let oldview = winsaveview()
-    if searchdecl(a:name) == 0
-        normal! B
-        let old_reg = @"
-        normal! yaW
-        let type = @"
-        let @" = old_reg
-        call winrestview(oldview)
-        let type = substitute(type, '\s\+$', '', '')
-
-        "searchdecl treats  'return foo;' as a declaration of foo
-        if type != 'return'
-            return type
-        endif
-    endif
-    return "<+type+>"
-endfunction
-
-
-"global {{{1
-function! s:start_comment()
-    return substitute(&commentstring, '^\([^ ]*\)\s*%s\(.*\)$', '\1', '')
-endfunction
-
-function! s:end_comment()
-    return substitute(&commentstring, '^.*%s\(.*\)$', '\1', '')
-endfunction
-
-function! Snippet_Modeline()
-    return s:start_comment() . " vim: set ${1:settings}:" . s:end_comment()
-endfunction
-
-function! Snippet_Camelcase(s)
-    "upcase the first letter
-    let toReturn = substitute(a:s, '^\(.\)', '\=toupper(submatch(1))', '')
-    "turn all '_x' into 'X'
-    return substitute(toReturn, '_\(.\)', '\=toupper(submatch(1))', 'g')
-endfunction
-
-function! Snippet_Underscore(s)
-    "down the first letter
-    let toReturn = substitute(a:s, '^\(.\)', '\=tolower(submatch(1))', '')
-    "turn all 'X' into '_x'
-    return substitute(toReturn, '\([A-Z]\)', '\=tolower("_".submatch(1))', 'g')
-endfunction
-
-
-" modeline {{{1
-" vim: set fdm=marker:
diff --git a/vim/snippets/vim/au.snippet b/vim/snippets/vim/au.snippet
deleted file mode 100755
index d59720a..0000000
--- a/vim/snippets/vim/au.snippet
+++ /dev/null
@@ -1 +0,0 @@
-autocmd ${1:events} ${2:pattern} ${3:command}
diff --git a/vim/snippets/vim/com.snippet b/vim/snippets/vim/com.snippet
deleted file mode 100755
index b8eeb5b..0000000
--- a/vim/snippets/vim/com.snippet
+++ /dev/null
@@ -1 +0,0 @@
-command! -nargs=${1:number_of_args} ${2:other_params} ${2:name} ${2:command}
diff --git a/vim/snippets/vim/func.snippet b/vim/snippets/vim/func.snippet
deleted file mode 100755
index 8591a83..0000000
--- a/vim/snippets/vim/func.snippet
+++ /dev/null
@@ -1,8 +0,0 @@
-"Function: $1
-"Desc: ${3:description}
-"
-"Arguments:
-"${4}
-function! ${1:name}(${2})
-	${5}
-endfunction
diff --git a/vim/snippets/vim/if.snippet b/vim/snippets/vim/if.snippet
deleted file mode 100755
index 336e7a0..0000000
--- a/vim/snippets/vim/if.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-if ${1}
-	${2}
-endif
diff --git a/vim/snippets/vim/ife.snippet b/vim/snippets/vim/ife.snippet
deleted file mode 100755
index c5d1693..0000000
--- a/vim/snippets/vim/ife.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-if ${1}
-	${2}
-else
-endif
diff --git a/vim/snippets/vim/log.snippet b/vim/snippets/vim/log.snippet
deleted file mode 100755
index 5a86754..0000000
--- a/vim/snippets/vim/log.snippet
+++ /dev/null
@@ -1 +0,0 @@
-echomsg ${1}
diff --git a/vim/snippets/vim/try.snippet b/vim/snippets/vim/try.snippet
deleted file mode 100755
index cd4c0e7..0000000
--- a/vim/snippets/vim/try.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-try
-	${2}
-catch /${1}/
-endtry
diff --git a/vim/snippets/xslt/call.snippet b/vim/snippets/xslt/call.snippet
deleted file mode 100755
index 2fe4f9d..0000000
--- a/vim/snippets/xslt/call.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	<xsl:call-template name="${1:template}">
-		${2}
-	</xsl:call-template>
diff --git a/vim/snippets/xslt/choose.snippet b/vim/snippets/xslt/choose.snippet
deleted file mode 100755
index 1a87754..0000000
--- a/vim/snippets/xslt/choose.snippet
+++ /dev/null
@@ -1,7 +0,0 @@
-	<xsl:choose>
-		<xsl:when test="${1:test}">
-			${2}
-		</xsl:when>
-		<xsl:otherwise>
-		</xsl:otherwise>
-	</xsl:choose>
diff --git a/vim/snippets/xslt/mat.snippet b/vim/snippets/xslt/mat.snippet
deleted file mode 100755
index a566e0e..0000000
--- a/vim/snippets/xslt/mat.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	<xsl:template match="${1:match}"/>
-		${2}
-	</xsl:template> 
diff --git a/vim/snippets/xslt/out.snippet b/vim/snippets/xslt/out.snippet
deleted file mode 100755
index 88e70c2..0000000
--- a/vim/snippets/xslt/out.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	<xsl:output omit-xml-declaration="${1:yes}" method="${2:html}"/>
diff --git a/vim/snippets/xslt/param.snippet b/vim/snippets/xslt/param.snippet
deleted file mode 100755
index f4f9a50..0000000
--- a/vim/snippets/xslt/param.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	<xsl:param name="${1:name}" />
diff --git a/vim/snippets/xslt/sty.snippet b/vim/snippets/xslt/sty.snippet
deleted file mode 100755
index f6751c7..0000000
--- a/vim/snippets/xslt/sty.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	${1}
-	</xsl:stylesheet>
diff --git a/vim/snippets/xslt/tem.snippet b/vim/snippets/xslt/tem.snippet
deleted file mode 100755
index bcd86d6..0000000
--- a/vim/snippets/xslt/tem.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	<xsl:template name="${1:name}">
-		${2}
-	</xsl:template>
diff --git a/vim/snippets/xslt/value.snippet b/vim/snippets/xslt/value.snippet
deleted file mode 100755
index 9128cc6..0000000
--- a/vim/snippets/xslt/value.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	<xsl:value-of select="${1:select}"/>
diff --git a/vim/snippets/xslt/var.snippet b/vim/snippets/xslt/var.snippet
deleted file mode 100755
index d21b77c..0000000
--- a/vim/snippets/xslt/var.snippet
+++ /dev/null
@@ -1,3 +0,0 @@
-	<xsl:variable name="${1:name}"/>
-		${2}
-	</xsl:variable>
diff --git a/vim/snippets/xslt/wparam.snippet b/vim/snippets/xslt/wparam.snippet
deleted file mode 100755
index 2284b71..0000000
--- a/vim/snippets/xslt/wparam.snippet
+++ /dev/null
@@ -1 +0,0 @@
-	<xsl:with-param name="${1:name}" select="${2:select}" />
diff --git a/vim/snippets/xslt/xdec.snippet b/vim/snippets/xslt/xdec.snippet
deleted file mode 100755
index f1e4420..0000000
--- a/vim/snippets/xslt/xdec.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-	<?xml version="1.0" ecoding="${1:encoding}"?>
-	${2}
diff --git a/vim/snippets/zend/assert.snippet b/vim/snippets/zend/assert.snippet
deleted file mode 100644
index ca928f2..0000000
--- a/vim/snippets/zend/assert.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->assertTrue(${1:somevar}, '${2:sometext}');
diff --git a/vim/snippets/zend/boolcol.snippet b/vim/snippets/zend/boolcol.snippet
deleted file mode 100644
index 715fe19..0000000
--- a/vim/snippets/zend/boolcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->hasColumn('${1:active}', '${2:boolean}', ${3:1}, array('default' => '${4:1}','notnull' => true));
diff --git a/vim/snippets/zend/clac.snippet b/vim/snippets/zend/clac.snippet
deleted file mode 100644
index 80972a1..0000000
--- a/vim/snippets/zend/clac.snippet
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * $1Controller
- * @package       ${2}
- * @author        ${3:`g:snips_author`}
- * @copyright     (c) `strftime("%Y")`
- */
-class ${1:Index}Controller extends Application_Controller
-{
-	/**
-	 * indexAction
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function indexAction(){
-		${4:// some code}
-	}
-}
diff --git a/vim/snippets/zend/flash.snippet b/vim/snippets/zend/flash.snippet
deleted file mode 100644
index d382748..0000000
--- a/vim/snippets/zend/flash.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->_flashMessenger->addMessage("${1}", '${2:error}');
diff --git a/vim/snippets/zend/getconf.snippet b/vim/snippets/zend/getconf.snippet
deleted file mode 100644
index 10f2b20..0000000
--- a/vim/snippets/zend/getconf.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$${1:conf} = Zend_Registry::get('${2:config}')->${3:general};
diff --git a/vim/snippets/zend/input.snippet b/vim/snippets/zend/input.snippet
deleted file mode 100644
index 3c4ed27..0000000
--- a/vim/snippets/zend/input.snippet
+++ /dev/null
@@ -1,4 +0,0 @@
-<?= $this->formInput(array( 'type' => '${1:hidden}',
-							'name' => '${2}',
-							'value' => ${3:},
-							'id' => '${4:}' )); ?>
diff --git a/vim/snippets/zend/inputarr.snippet b/vim/snippets/zend/inputarr.snippet
deleted file mode 100644
index 8e97bee..0000000
--- a/vim/snippets/zend/inputarr.snippet
+++ /dev/null
@@ -1,6 +0,0 @@
-<?= $this->formInput(array( 'type' => '${1:dropdown}',
-			    'name' => '${2}',
-			    'label' => '${3:}',
-			    'errors' => ${4:},
-			    'value' => ${5:},
-			    'valueList' => ${6:} )); ?>
diff --git a/vim/snippets/zend/intcol.snippet b/vim/snippets/zend/intcol.snippet
deleted file mode 100644
index caacaa6..0000000
--- a/vim/snippets/zend/intcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->hasColumn('${1:id}', '${2:integer}', ${3:11}, array(${4:'notnull' => true)});
diff --git a/vim/snippets/zend/lib.snippet b/vim/snippets/zend/lib.snippet
deleted file mode 100644
index 683e22e..0000000
--- a/vim/snippets/zend/lib.snippet
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Application_${1:Hellu}
-{${2}
-}
diff --git a/vim/snippets/zend/model.snippet b/vim/snippets/zend/model.snippet
deleted file mode 100644
index 0c267f5..0000000
--- a/vim/snippets/zend/model.snippet
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-class ${1:Model} extends Doctrine_Record implements Zend_Auth_Adapter_Interface, Zend_Acl_Role_Interface
-{
-	protected  $searchconditions = array();
-
-	/**
-	 * Enter description here...
-	 *
-	 * @var ${2:Model}
-	 */
-	protected static $_identity = null;
-
-	/**
-	 * Zend_Auth
-	 *
-	 * @var Zend_Auth
-	 */
-	protected static $_auth;
-
-
-	/**
-	 * Doctrine
-	 */
-	public function setTableDefinition()
-	{
-		$this->hasColumn('id', 'integer', 4, array('notnull' => true, 
-												   'primary' => true, 
-												   'autoincrement' => true));
-		${3}
-	}
-
-}
diff --git a/vim/snippets/zend/navi.snippet b/vim/snippets/zend/navi.snippet
deleted file mode 100644
index 2724ff9..0000000
--- a/vim/snippets/zend/navi.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->view->navigationActive = array('topnavi' => '${1:home}','subnavi' => '${2:index}');
diff --git a/vim/snippets/zend/route.snippet b/vim/snippets/zend/route.snippet
deleted file mode 100644
index cdf834b..0000000
--- a/vim/snippets/zend/route.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->_redirector->gotoRoute(array('controller' => '${1}', 'action' => '${2:index}', 'id' => '${3:}'), '${4:admin_action}');
diff --git a/vim/snippets/zend/rp.snippet b/vim/snippets/zend/rp.snippet
deleted file mode 100644
index b5dcd1f..0000000
--- a/vim/snippets/zend/rp.snippet
+++ /dev/null
@@ -1,2 +0,0 @@
-<?=$this->partial('${1:somefile}.phtml',
-				  array(${2}))?>
diff --git a/vim/snippets/zend/strcol.snippet b/vim/snippets/zend/strcol.snippet
deleted file mode 100644
index 98d3cf3..0000000
--- a/vim/snippets/zend/strcol.snippet
+++ /dev/null
@@ -1 +0,0 @@
-$this->hasColumn('${1:title}', '${2:string}', ${3:255}, array(${4:'notnull' => true}));