Merge pull request #4 from elemoine/sync

Sync from mk-lab-salt-model classes/system