Merge pull request #10 from Utreekov/master

Added the bones of a magic system and a between the waves command parser
Fixes

Removed breaks from shop module, and added clarifying text.  Messed around with some of the messages to make them more readable.
Merge pull request #11 from bedevere/0.131

0.131
Merge pull request #9 from bedevere/master

Updating my stuff