pull upstream to josephknight

Not sure if this will work. The user interface on github.com is vague on which direction the pull is occurring. Very confusing.