Minus-7-Games/tradesong — pull request #450 by icbat (2014-10-19 19:36:20+00:00)
Title: Pre alpha two

too big of a branch. merging in all of these so I can start working with sane branching/features now that it's less ground-work.