diff --git a/.gitignore b/.gitignore
index 8fa66f02f..b2022081a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
-locals.zsh
-log/.zsh_history
-projects.zsh
-custom
+# custom files
+custom/
 !custom/plugins/example
 !custom/example.zsh
-*.swp
-!custom/example.zshcache
+
+# temp files directories
 cache/
+log/
diff --git a/MIT-LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from MIT-LICENSE.txt
rename to LICENSE.txt
diff --git a/README.markdown b/README.md
similarity index 99%
rename from README.markdown
rename to README.md
index 0cbea72c9..5f152e4df 100644
--- a/README.markdown
+++ b/README.md
@@ -210,4 +210,4 @@ We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-
 
 ## License
 
-Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt).
+Oh My Zsh is released under the [MIT license](LICENSE.txt).
diff --git a/cache/.easter-egg b/cache/.easter-egg
deleted file mode 100644
index 4b6164edb..000000000
--- a/cache/.easter-egg
+++ /dev/null
@@ -1,4 +0,0 @@
-This file is only here so that Git will keep a cache directory as .gitignore is ignoring all the files within it.
-
-Feel free to add love notes for people here.
-
diff --git a/cache/.gitkeep b/cache/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/custom/example.zsh b/custom/example.zsh
index 28ffcae25..c505a9673 100644
--- a/custom/example.zsh
+++ b/custom/example.zsh
@@ -1,5 +1,10 @@
-# Add yourself some shortcuts to projects you often work on
-# Example:
+# You can put files here to add functionality separated per file, which
+# will be ignored by git.
+# Files on the custom/ directory will be automatically loaded by the init
+# script, in alphabetical order.
+
+# For example: add yourself some shortcuts to projects you often work on.
+#
+# brainstormr=~/Projects/development/planetargon/brainstormr
+# cd $brainstormr
 #
-# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
-#
\ No newline at end of file
diff --git a/log/.easter-egg b/log/.easter-egg
deleted file mode 100644
index 2533149e2..000000000
--- a/log/.easter-egg
+++ /dev/null
@@ -1,4 +0,0 @@
-This file is only here so that Git will keep a log directory as .gitignore is ignoring all the log files within it.
-
-feel free to add love notes for people here.
-
diff --git a/log/.gitkeep b/log/.gitkeep
new file mode 100644
index 000000000..e69de29bb