Surram/quickbits — pull request #57 by ckampfe (2013-12-05 00:27:32+00:00)
Title: remove more merge artifacts

let's work on not leaving this stuff in