8 files changed, 33 insertions, 72 deletions
diff --git a/plugins/atom/README.md b/plugins/atom/README.md
deleted file mode 100644
index 6350c647b..000000000
--- a/plugins/atom/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## atom
-
-This plugin makes "at" a useful function for invoking the Atom Editor.
-
-Originally by Github user [aforty](https://github.com/aforty) for OSX, modified to alias 'at' to 'atom' for Linux, since atom already works on the terminal for Linux, and calling 'at' in a non-OSX environment should still work.
-
-### Requirements
-
- * [Atom](https://atom.io/)
-
-### Usage
-
- * If `at` command is called without an argument, launch Atom
-
- * If `at` is passed a directory, open it in Atom
-
- * If `at` is passed a file, open it in Atom
-
-### Examples
-
- * Open the current dir in atom: `at .`
- * Open another dir in atom: `at path/to/folder`
- * Open a file: `at filename.extension`
diff --git a/plugins/atom/atom.plugin.zsh b/plugins/atom/atom.plugin.zsh
deleted file mode 100644
index 2711cf0e8..000000000
--- a/plugins/atom/atom.plugin.zsh
+++ /dev/null
@@ -1,37 +0,0 @@
-case $OSTYPE in
-darwin*)
-    local _atom_paths > /dev/null 2>&1
-    _atom_paths=(
-        "$HOME/Applications/Atom.app"
-        "/Applications/Atom.app"
-    )
-
-    for _atom_path in $_atom_paths; do
-        if [[ -a $_atom_path ]]; then
-            alias at="open -a '$_atom_path'"
-            break
-        fi
-    done
-    ;;
-cygwin)
-    local _atom_path > /dev/null 2>&1
-
-    _atom_path=${LOCALAPPDATA}/atom/bin/atom
-
-    if [[ -a $_atom_path ]]; then
-        cyg_open_atom()
-        {
-            if [[ -n $1 ]]; then
-                ${_atom_path} `cygpath -w -a $1`
-            else
-                ${_atom_path}
-            fi
-        }
-
-        alias at=cyg_open_atom
-    fi
-    ;;
-linux*)
-    # Alerts the user if 'atom' is not a found command.
-    type atom >/dev/null 2>&1 && alias at="atom" || { echo >&2 "You have enabled the atom oh-my-zsh plugin on Linux, but atom is not a recognized command. Please make sure you have it installed before using this plugin."; }
-esac
diff --git a/plugins/git-hubflow/git-hubflow.plugin.zsh b/plugins/git-hubflow/git-hubflow.plugin.zsh
index 4cf5b9177..b0157c7a1 100644
--- a/plugins/git-hubflow/git-hubflow.plugin.zsh
+++ b/plugins/git-hubflow/git-hubflow.plugin.zsh
@@ -20,6 +20,13 @@
 #     c. Or, use this file as an oh-my-zsh plugin.
 #
 
+alias ghf='git hf'
+alias ghff='git hf feature'
+alias ghfr='git hf release'
+alias ghfh='git hf hotfix'
+alias ghfs='git hf support'
+alias ghfu='git hf update'
+
 _git-hf ()
 {
     local curcontext="$curcontext" state line
diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh
index 8e11a444f..f7eaefa85 100644
--- a/plugins/gulp/gulp.plugin.zsh
+++ b/plugins/gulp/gulp.plugin.zsh
@@ -19,8 +19,8 @@
 # Grabs all available tasks from the `gulpfile.js`
 # in the current directory.
 #
-function $$gulp_completion() {
-    compls=$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
+function $$gulp_completion {
+    compls="$(grep -Eo "gulp.task\((['\"](([a-zA-Z0-9]|-)*)['\"],)" gulpfile.js 2>/dev/null | grep -Eo "['\"](([a-zA-Z0-9]|-)*)['\"]" | sed s/"['\"]"//g | sort)"
 
     completions=(${=compls})
     compadd -- $completions
diff --git a/plugins/nmap/README.md b/plugins/nmap/README.md
index 8bb8e0648..5cd646277 100644
--- a/plugins/nmap/README.md
+++ b/plugins/nmap/README.md
@@ -19,14 +19,19 @@ Nmap options are:
 
 ## Aliases explained
 
- * nmap_open_ports - scan for open ports on target
- * nmap_list_interfaces - list all network interfaces on host where the command runs
- * nmap_slow - slow scan that avoids to spam the targets logs
- * nmap_fin - scan to see if hosts are up with TCP FIN scan
- * nmap_full - aggressive full scan that scans all ports, tries to determine OS and service versions
+ * nmap_open_ports - Scan for open ports on target
+ * nmap_list_interfaces - List all network interfaces on host where the command runs
+ * nmap_slow - Slow scan that avoids to spam the targets logs
+ * nmap_fin - Scan to see if hosts are up with TCP FIN scan
+ * nmap_full - Aggressive full scan that scans all ports, tries to determine OS and service versions
  * nmap_check_for_firewall - TCP ACK scan to check for firewall existence
  * nmap_ping_through_firewall - Host discovery with SYN and ACK probes instead of just pings to avoid firewall
    restrictions
  * nmap_fast - Fast scan of the top 300 popular ports
- * nmap_detect_versions - detects versions of services and OS, runs on all ports
- * nmap_check_for_vulns - uses vulscan script to check target services for vulnerabilities
+ * nmap_detect_versions - Detects versions of services and OS, runs on all ports
+ * nmap_check_for_vulns - Uses vulscan script to check target services for vulnerabilities
+ * nmap_full_udp - Same as full but via UDP
+ * nmap_traceroute - Try to traceroute using the most common ports
+ * nmap_full_with_scripts - Same as nmap_full but also runs all the scripts
+ * nmap_web_safe_osscan - Little "safer" scan for OS version  as connecting to only HTTP and HTTPS ports doesn't look so attacking.
+
diff --git a/plugins/nmap/nmap.plugin.zsh b/plugins/nmap/nmap.plugin.zsh
index f3603f622..d09f2c615 100644
--- a/plugins/nmap/nmap.plugin.zsh
+++ b/plugins/nmap/nmap.plugin.zsh
@@ -22,7 +22,11 @@ alias nmap_fin="nmap -sF -v"
 alias nmap_full="nmap -sS -T4 -PE -PP -PS80,443 -PY -g 53 -A -p1-65535 -v"
 alias nmap_check_for_firewall="nmap -sA -p1-65535 -v -T4"
 alias nmap_ping_through_firewall="nmap -PS -PA"
-alias nmap_fast="nmap -F -T5 --top-ports 300"
+alias nmap_fast="nmap -F -T5 --version-light --top-ports 300"
 alias nmap_detect_versions="nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
 alias nmap_check_for_vulns="nmap --script=vulscan"
+alias nmap_full_udp="nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
+alias nmap_traceroute="nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
+alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
+alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
 
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 595105d3c..3f6fe0fb3 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -1,8 +1,9 @@
 eval "$(npm completion 2>/dev/null)"
 
+# Install dependencies globally
+alias npmg="npm i -g "
 
 # npm package names are lowercase
-# - https://twitter.com/substack/status/23122603153150361
 # Thus, we've used camelCase for the following aliases:
 
 # Install and save to dependencies in your package.json
@@ -12,6 +13,7 @@ alias npmS="npm i -S "
 # Install and save to dev-dependencies in your package.json
 # npmd is used by https://github.com/dominictarr/npmd
 alias npmD="npm i -D "
+
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
 alias npmE='PATH="$(npm bin)":"$PATH"'
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index b63a857a7..0a2fa0839 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -179,7 +179,10 @@ function simulator {
   if [[ -d "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app" ]]; then
     open "${devfolder}/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app"
   # Xcode ≥ 6.x
-  else
+  elif [[ -d "${devfolder}/Applications/iOS Simulator.app" ]]; then
     open "${devfolder}/Applications/iOS Simulator.app"
+  # Xcode ≥ 7.x
+  else
+    open "${devfolder}/Applications/Simulator.app"
   fi
 }