Merge pull request #1 from imeikle/master

Rebase
Cleaned up column names, but still need to be human readable
Merge pull request #1 from zen-ian/master

Column names cleaned