jdmielke/bigsky — pull request #4 by jdmielke (2013-10-21 04:08:52+00:00)
Title: pulling from upstream on 10/20

will be lots of merge conflicts