diff --git a/.gitignore b/.gitignore
index 1740398..51dd633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 _site
+.bundle
 .sass-cache
 .jekyll-metadata
 .DS_store
 .ruby-version
 .tweet-cache/
 Gemfile.lock
+vendor
diff --git a/bin/deploy b/bin/deploy
index 72b4e2f..070e2f7 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -67,6 +67,15 @@ if ! git diff-index --quiet HEAD --; then
     [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 fi
 
+# Check if there are any untracked files
+if ! test -z "$(git ls-files --exclude-standard --others)"; then
+    echo "There are untracked files:"
+    git ls-files --exclude-standard --others
+    echo "Please commit those files or stash them before proceeding."
+    echo "Aborting."
+    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
 # Switch to source branch (creates it if necessary from the current branch)
 if [ `git branch | grep $SRC_BRANCH | tr ' ' '\n' | tail -1` ]
 then