diff --git a/defaults/main.yml b/defaults/main.yml
index 9c42c17..f0f64d3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,17 +1,27 @@
 ---
+
+# Install 1 or more versions of ruby
 rvm1_rubies:
   - 'ruby-2.1.2'
 
-rvm1_delete_ruby: []
+# Delete a specific version of ruby (ie. ruby-2.1.0)
+rvm1_delete_ruby:
 
-rvm1_user: '{{ ansible_ssh_user }}'
-rvm1_group: 'rvm'
+# Install path for rvm (defaults to system wide)
+rvm1_install_path: '/usr/local/lib/rvm'
 
-rvm1_temp_download_path: '/usr/local/src'
-rvm1_install_path: '/usr/local/rvm'
+# Add or remove any install flags
+# NOTE: If you are doing a USER BASED INSTALL then
+#       make sure you ADD the --user-install flag below
+rvm1_install_flags: '--auto-dotfiles'
 
-rvm1_rvm_latest_installer: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer'
-rvm1_rvm_stable_version_number: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/VERSION'
+# Should rvm always be upgraded?
 rvm1_rvm_force_upgrade_installer: False
 
+# URLs for the latest installer and version
+rvm1_rvm_latest_installer: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/binscripts/rvm-installer'
+rvm1_rvm_stable_version_number: 'https://raw.githubusercontent.com/wayneeseguin/rvm/master/VERSION'
+
+# Time in seconds before re-running apt-get update
+# This is only used to download the httplib library so Ansible's URI module works
 apt_cache_valid_time: 86400