Removed a lot of redundancy in definitions by using macros
Merge branch 'master' of github.com:akathorn/elfcala