Use standards damnit
Merge pull request #1 from ShaneHudson/master

Use standards damnit!