Fixed some things, broke some other things. Don't try to use
createrecipe right now.
Merge branch 'master' of http://github.com/se-SteveThePirate/CMPUT301W13T01