Merge pull request #7 from acbrewbaker/master

making sure things match HCL
Merge pull request #8 from acbrewbaker/master

many fixes
Merge pull request #9 from acbrewbaker/master

27/45
passes 8, i messed something up
passes 8
Merge pull request #13 from l3ullseye12/acbrewbaker-master

Acbrewbaker master