Clean inliners up + back to KeyMaster signature
Package stuff
Merge pull request #8 from wiredearp/master

Merge this!