diff --git a/.gitignore b/.gitignore
index a90f79a61..b6dd8396e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 .DS_Store
+.bundle
+.env
 .idea
-Thumbs.db
-.rvmrc
 .ruby-version
+.rvmrc
 .sass-cache
+Thumbs.db
diff --git a/Rakefile b/Rakefile
index e7e02c395..52a35a2ed 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,5 +24,5 @@ end
 
 desc "run the site locally (visit http://localhost:9292)"
 task :run do
-  rerun "rackup -s thin"
+  rerun "rackup -s thin -p #{ENV['PORT'] || 9292}"
 end