Blind commit.
Merge github.com:GiantThinkwell/tsubame
Getting ready for Tsubame to fly again.
Things.