Squashed commit of the following:

commit b37c591b2d65a052b66271eb437fc28ecdfe052f
Author: Jim Kalafut <jim@kalafut.net>
Date:   Thu Jan 17 21:37:37 2013 -0800

    .

commit 6a3bb8881f66d6dfb8ebc8ea2cbe812a52bff7f0
Merge: 6f7a154 aeee52a
Author: Jim Kalafut <jim@kalafut.net>
Date:   Thu Jan 17 19:43:45 2013 -0800

    Merge branch 'master' into docs

    Conflicts:
    	docs/contributing.rst

commit 6f7a154eb26f4222777ab1f6b5ffdf169885251d
Author: Jim Kalafut <jim@kalafut.net>
Date:   Thu Jan 17 12:25:54 2013 -0800

    .

commit 466e7572b40ec29fad67123a8b94936778da1f07
Author: Jim Kalafut <jim@kalafut.net>
Date:   Thu Jan 17 11:29:25 2013 -0800

    Added section about unicode