FractalUK/KSPInterstellar — pull request #34 by WaveFunctionP (2014-03-30 21:42:48+00:00)
Title: development merge

I think I finally learned how to merge from upstream. This should resolve the conflicts.