Merge pull request #5 from evilensky/master

Submodule updates, plus we can stand up Fedora using Puppetlabs-MySQL
first push, can i get some feedback?
style changes
removing rbenv
Merge pull request #6 from mbklein/removing_rbenv_and_replacing_it_with_rvm

first push, can i get some feedback?
Remove vestigial shell script
Merge branch 'upstream_integration'

Conflicts:
	.gitmodules
	manifests/avalon/framework.pp