Redirect STDERR to function to make errors prettier. Hopefully this actually works. Let me know if this fails miserably.
Dammit, forgot to close a file descriptor. Oops.
Merge remote-tracking branch 'upstream/master'