Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc

vim/snippets/android/java.snippets

@@ -0,0 +1,61 @@
+snippet imp android.app.Activity
+	import android.app.Activity;
+snippet imp android.os.Bundle
+	import android.os.Bundle;
+snippet imp android.view.Menu
+	import android.view.Menu;
+snippet imp android.view.MenuInflater
+	import android.view.MenuInflater;
+snippet imp java.util.ArrayList
+	import java.util.ArrayList;
+
+snippet oncreate
+	@Override
+	public void
+	onCreate(Bundle savedInstanceState)
+	{
+		${0}
+	}
+
+snippet oncreateoptionsmenu
+	@Override
+	public void
+	onCreateOptionsMenu(Menu menu,
+	                    MenuInflater inflater)
+	{
+		${0}
+	}
+
+snippet oncreateview Fragment.onCreateView()
+	@Override
+	public View
+	onCreateView(LayoutInflater inflater,
+	             ViewGroup container,
+	             Bundle savedInstanceState)
+	{
+		${0}
+	}
+
+snippet acc
+	/**
+	 * Getter for $3.
+	 *
+	 * @return ${5:A foo.}
+	 */
+	public ${2:int}
+	get${1:Foo}()
+	{
+		return ${3:mFoo};
+	}
+	
+	
+	/**
+	 * Setter for $3.
+	 *
+	 * @param $4 ${6:$5}
+	 */
+	public void
+	set$1(final $2 ${4:foo})
+	{
+		$3 = $4;
+	}${0}

vimrc

@@ -141,9 +141,10 @@ endtry
 " Empty snipmate options dictionary
 let g:snipMate = {}
 " tell SnipMate who I am
-if has('loaded_snips')
 let g:snips_author = 'Eryn Wells <eryn@erynwells.me>'
-endif
+" Set up some snippet scope aliases
+let g:snipMate.scope_aliases = {}
+let g:snipMate.scope_aliases["java"] = "android"
 
 " set the Gundo preview window on the bottom
 if has('loaded_gundo')
@@ -290,10 +291,10 @@ if has('autocmd')
     " Reload snippets after editing the snippets file. Snippet files are
     " <filetype>.snippets. Get <filetype> from the filename and reload the
     " snippets for that type.
-    augroup ReloadSnippets
-        autocmd!
-        autocmd BufWritePost *.snippets :call ReloadSnippets(expand('%:t:r'))
-    augroup END
+    "augroup ReloadSnippets
+    "    autocmd!
+    "    autocmd BufWritePost *.snippets :call ReloadSnippets(expand('%:t:r'))
+    "augroup END
 
     " Clean whitespace before saving: Python, C, HTML, and Objective-C
     augroup StripTrailingWhitespace