Changed how the RVM info is retrieved.

It appears to be best to have .ruby-version and .ruby-gemset files declared
for a ruby project, so now reading those files to get the info for the prompt
vs. trying to use the default rvm prompt file.
Reformatted a couple widgets and removed some unneeded lines.
Resolved the merge conflict.
Merge branch 'master' of github.com:sybrandy/local_config

Conflicts:
	.config/awesome/rc.lua