Merge pull request #10 from damjanek/master

Add xenial preseed + move machines to separate state