Merge branch 'release/0.1'

Test to see if this works with Openshift
testing
test
Added more data and corrected spellings in cuisine, magic items and NPC
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop' of https://github.com/CityGenerator/Megacosm-Generator into develop

Conflicts:
	data/npc.data
Merge branch 'develop' of https://github.com/CityGenerator/Megacosm-Generator into develop
haarrrpies
testing travis config
fixing travis?
increasing twill version
Merge branch 'master' of https://github.com/CityGenerator/Megacosm-Generator into develop

Conflicts:
	wsgi/megacosm.py
Merge branch 'develop' of https://github.com/CityGenerator/Megacosm-Generator into multiflag

Conflicts:
	data/npc.data
Merge branch 'master' of https://github.com/mareofnight/Megacosm-Generator into develop
Merge branch 'develop' of https://github.com/CityGenerator/Megacosm-Generator into develop

Conflicts:
	data/npc.data
Merge branch 'multiflag' into develop
fixed a mistake I made merging data/npc.data
Fixed a mistake I made in merging data/npc.data
fixing merge mistakes (should have deleted /wsgi)