Merge branch 'master' of github.com:wpscanteam/wpscan

.gitignore

@@ -12,3 +12,12 @@ Gemfile.lock
 _yardoc
 doc/
 .wpscan/
+
+.ash_history
+.DS_Store
+.DS_Store?
+.idea/
+
+# Old files from v2
+cache/
+data/

bin/wpscan-docker

@@ -9,6 +9,6 @@ done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 cd $DIR/../
-docker build -q -t wpscanv3:git .
-docker run -it --rm wpscanv3:git "$@"
+docker build -q -t wpscan:git .
+docker run -it --rm wpscan:git "$@"
 

bin/wpscan-docker-dev

@@ -10,7 +10,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 cd $DIR/../
 if [[ -n "$WPSCAN_BUILD" ]]; then
-  docker build -q -t wpscanv3:git .
+  docker build -q -t wpscan:git .
 fi
-docker run -it --rm -v $DIR/../:/wpscan wpscanv3:git "$@"
+docker run -it --rm -v $DIR/../:/wpscan wpscan:git "$@"