diff --git a/.gitignore b/.gitignore
index f1c4554..0c7472c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,39 @@
-.rebar3
-_*
+# erlang
 .eunit
 *.o
 *.beam
 *.plt
-*.swp
-*.swo
-.erlang.cookie
-ebin
-log
 erl_crash.dump
+.concrete/DEV_MODE
+
+# rebar 2.x
 .rebar
-logs
-_build
-.idea
-*.iml
+rel/example_project
+ebin/*.beam
+deps
+
+# rebar 3
+.rebar3
 rebar3.crashdump
+_build/
+_checkouts/
+rebar.lock
+
+# emacs
 *~
+\#*\#
+.\#*
+.emacs.desktop
+.emacs.desktop.lock
+
+# vim
+*.swp
+*.swo
+
+# apple
+.DS_Store
+
+# misc
+/priv/images/drafts/*
+/doc/*
+/priv/output/*