had to remove some stuff that was causing me problems, will put them
back soon.
Merge branch 'master' of https://github.com/johnnygaffey/salt-states

Conflicts:
	media/init.sls