Refactor module and update
Merge branch 'master' into HEAD

Conflicts:
	Modulefile
	README.md
	files/themes/graphene.1.8.3.zip
	files/themes/suffusion.4.4.6.zip
	manifests/app.pp
	manifests/db.pp
	manifests/init.pp
	tests/init.pp