Cleans up some cruft.
Merge branch 'development' of https://github.com/DanLovesProofs/xuggle-xuggler