Updating to be a subdir.
Updated rvmrc and gitignore.
Merging