Merge branch 'development'

Conflicts:
	rlgeex_toolkit/manifests/init.pp
Merge pull request #6 from nicholasvmoore/development

Development
Merge branch 'development'
merging dev to master