removed mafro
included git state
fixes to user state
removed ssh state