Update to 1.1
Nuke some unnecessary stuff, since I doubt we're trying to support RHEL5.
Merge pull request #2 from CodeBlock/master

Update to 1.1 with some changes.