add google_appengine to PATH
add gitignore
Merge branch 'master' of github.com:morinatsu/dotfiles
temp commit for merge

Conflicts:
	vim/bundle/.neobundle/doc/arabic.jax
	vim/bundle/.neobundle/doc/autocmd.jax
	vim/bundle/.neobundle/doc/change.jax
	vim/bundle/.neobundle/doc/cmdline.jax
	vim/bundle/.neobundle/doc/debugger.jax
	vim/bundle/.neobundle/doc/develop.jax
	vim/bundle/.neobundle/doc/diff.jax
	vim/bundle/.neobundle/doc/digraph.jax
	vim/bundle/.neobundle/doc/editing.jax
	vim/bundle/.neobundle/doc/eval.jax
	vim/bundle/.neobundle/doc/filetype.jax
	vim/bundle/.neobundle/doc/fold.jax
	vim/bundle/.neobundle/doc/gui.jax
	vim/bundle/.neobundle/doc/gui_w16.jax
	vim/bundle/.neobundle/doc/gui_w32.jax
	vim/bundle/.neobundle/doc/gui_x11.jax
	vim/bundle/.neobundle/doc/helphelp.jax
	vim/bundle/.neobundle/doc/howto.jax
	vim/bundle/.neobundle/doc/if_cscop.jax
	vim/bundle/.neobundle/doc/if_lua.jax
	vim/bundle/.neobundle/doc/if_mzsch.jax
	vim/bundle/.neobundle/doc/if_ole.jax
	vim/bundle/.neobundle/doc/if_perl.jax
	vim/bundle/.neobundle/doc/if_pyth.jax
	vim/bundle/.neobundle/doc/if_ruby.jax
	vim/bundle/.neobundle/doc/if_sniff.jax
	vim/bundle/.neobundle/doc/if_tcl.jax
	vim/bundle/.neobundle/doc/index.jax
	vim/bundle/.neobundle/doc/insert.jax
	vim/bundle/.neobundle/doc/intro.jax
	vim/bundle/.neobundle/doc/map.jax
	vim/bundle/.neobundle/doc/mbyte.jax
	vim/bundle/.neobundle/doc/message.jax
	vim/bundle/.neobundle/doc/mlang.jax
	vim/bundle/.neobundle/doc/motion.jax
	vim/bundle/.neobundle/doc/neocomplcache.txt
	vim/bundle/.neobundle/doc/neosnippet.txt
	vim/bundle/.neobundle/doc/netbeans.jax
	vim/bundle/.neobundle/doc/options.jax
	vim/bundle/.neobundle/doc/os_390.jax
	vim/bundle/.neobundle/doc/os_os2.jax
	vim/bundle/.neobundle/doc/os_vms.jax
	vim/bundle/.neobundle/doc/pattern.jax
	vim/bundle/.neobundle/doc/pi_netrw.jax
	vim/bundle/.neobundle/doc/quickfix.jax
	vim/bundle/.neobundle/doc/quickref.jax
	vim/bundle/.neobundle/doc/quotes.jax
	vim/bundle/.neobundle/doc/remote.jax
	vim/bundle/.neobundle/doc/repeat.jax
	vim/bundle/.neobundle/doc/sign.jax
	vim/bundle/.neobundle/doc/spell.jax
	vim/bundle/.neobundle/doc/starting.jax
	vim/bundle/.neobundle/doc/syntax.jax
	vim/bundle/.neobundle/doc/tabpage.jax
	vim/bundle/.neobundle/doc/tags
	vim/bundle/.neobundle/doc/tags-ja
	vim/bundle/.neobundle/doc/tagsrch.jax
	vim/bundle/.neobundle/doc/tips.jax
	vim/bundle/.neobundle/doc/uganda.jax
	vim/bundle/.neobundle/doc/undo.jax
	vim/bundle/.neobundle/doc/unite.txt
	vim/bundle/.neobundle/doc/usr_03.jax
	vim/bundle/.neobundle/doc/usr_04.jax
	vim/bundle/.neobundle/doc/usr_05.jax
	vim/bundle/.neobundle/doc/usr_08.jax
	vim/bundle/.neobundle/doc/usr_10.jax
	vim/bundle/.neobundle/doc/usr_11.jax
	vim/bundle/.neobundle/doc/usr_20.jax
	vim/bundle/.neobundle/doc/usr_21.jax
	vim/bundle/.neobundle/doc/usr_22.jax
	vim/bundle/.neobundle/doc/usr_27.jax
	vim/bundle/.neobundle/doc/usr_28.jax
	vim/bundle/.neobundle/doc/usr_32.jax
	vim/bundle/.neobundle/doc/usr_41.jax
	vim/bundle/.neobundle/doc/usr_toc.jax
	vim/bundle/.neobundle/doc/various.jax
	vim/bundle/.neobundle/doc/version4.jax
	vim/bundle/.neobundle/doc/vi_diff.jax
	vim/bundle/.neobundle/doc/vimproc.txt
	vim/bundle/.neobundle/doc/visual.jax
	vim/bundle/.neobundle/doc/vital-data-string.txt
	vim/bundle/.neobundle/doc/vital-date_time.txt
	vim/bundle/.neobundle/doc/vital-text-lexer.txt
	vim/bundle/.neobundle/doc/windows.jax
	vim/bundle/.neobundle/install_info
	vim/bundle/neobundle.vim
	vim/bundle/neosnippet/README.md
	vim/bundle/neosnippet/autoload/neocomplcache/sources/snippets_complete.vim
	vim/bundle/neosnippet/autoload/neosnippet.vim
	vim/bundle/neosnippet/autoload/neosnippet/snippets/java.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/lua.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/php.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/rails.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/ruby.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/sh.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/vim.snip
	vim/bundle/neosnippet/autoload/neosnippet/snippets/xhtml.snip
	vim/bundle/neosnippet/autoload/neosnippet/util.vim
	vim/bundle/neosnippet/autoload/unite/sources/snippet.vim
	vim/bundle/neosnippet/autoload/unite/sources/snippet_target.vim
	vim/bundle/neosnippet/doc/neosnippet.txt
	vim/bundle/neosnippet/syntax/snippet.vim
delete bundles from index