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
Need to recreate all of these...
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
updated city data
updated city data
Merge branch 'feature/city' of github.com:CityGenerator/Megacosm-Generator into feature/city
start of city.py
updated city data
start of city.py
Merge branch 'feature/city' of github.com:CityGenerator/Megacosm-Generator into feature/city
updated city data
start of city.py
Merge branch 'feature/city' of github.com:CityGenerator/Megacosm-Generator into feature/city
updated city data