Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh

custom/plugins/gitignore/gitignore.plugin.zsh

@@ -1,12 +0,0 @@
-function gi() { curl http://gitignore.io/api/$@ ;}
-
-_gitignireio_get_command_list() {
-  curl -s http://gitignore.io/api/list | tr "," "\n"
-}
-
-_gitignireio () {
-  compset -P '*,'
-  compadd -S '' `_gitignireio_get_command_list`
-}
-
-compdef _gitignireio gi

custom/plugins/sfffe/sfffe.plugin.zsh

@@ -1,28 +0,0 @@
-# ------------------------------------------------------------------------------
-#          FILE:  sfffe.plugin.zsh
-#   DESCRIPTION:  search file for FE
-#        AUTHOR:  yleo77 (ylep77@gmail.com)
-#       VERSION:  0.1
-#       REQUIRE:  ack
-# ------------------------------------------------------------------------------
-
-if [ ! -x $(which ack) ]; then
-    echo  \'ack\' is not installed!
-    exit -1
-fi
-
-ajs() {
-    ack "$@" --type js
-}
-
-acss() {
-    ack "$@" --type css
-}
-
-fjs() {
-    find ./ -name "$@*" -type f | grep '\.js'
-}
-
-fcss() {
-    find ./ -name "$@*" -type f | grep '\.css'
-}