File renaming going on
Just comments
Merge pull request #37 from Tradeshift/master

Some renaming