Attempting to clean up formatting.
Merge branch 'master' of github.com:Linuturk/salt-sprint
Merge pull request #8 from Gifflen/master

Merging changes