Revert "Merge conflicts"

This reverts commit 43f68bb871b210a87962690dc374590e20156d67, reversing
changes made to 148128009fa5e3861fec36ca9515a8cca86353c9.

This will remove the conflict markers that were committed upstream. Fixing issue #19.

Please take a look and make sure I didn't remove any functionality. I missed the last meeting and might be a bit out of the loop.