Refactored to work with new billit_representers gem
Merge branch 'master' into production