Merge branch 'release/0.1'

Test to see if this works with Openshift
testing
test
testing continents
broken commit, rebasing changes
fun with humans
weekend's unsuccessful changes...
many new races added, new npc features

Lots of good stuff in this, /npc now works
Merge branch 'feature/NPCs' into develop
added abo

added abo as an example
added npc builder

Not complete, but still pretty nice
added new stats
Merge branch 'feature/npc_querystrin' into develop

new npc builder
Merge branch 'develop' of github.com:CityGenerator/Megacosm-Generator into develop

adding new dwarf name
fix for firefox disabling
Fix for firefox reload grief.

As was pointed out last night, if you hit the back button, everything is disabled.
Added honor stat

started as trustworthiness, but that was too long.
Bootstrap added, fixed minor bug with minotaurs

Templates now looking nice. menu at the top as well as a bit of a roadmap for whay needs to be done next. It still needs work, but it's close enough
minotaurs had a typo, fixed that.
Merge branch 'feature/layout_revamp' into develop

Conflicts:
	templates/npc.html

ironed out.
Adding two new sizes