Changed CF
Added role 'locale'
Changed variables naming
Added role 'macbuntu'
Merge remote-tracking branch 'source/master'