Merge refactored roles

I am such git newb. Somehow managed to rebase *and* merge.
Any reason we can't use the [file module](http://docs.ansible.com/file_module.html) to set the uids/guids for these?