Merge pull request #19 from cybrxkhan/beta

Beta
Merge pull request #20 from cybrxkhan/beta

Silk Road historical events tweaking
Merge pull request #22 from thefinestsieve/beta

And even more stuff!
Moved portrait_properties.txt
Merge pull request #23 from cybrxkhan/beta

Beta
Merge pull request #24 from cybrxkhan/beta

Moved portrait_properties.txt
Merge pull request #25 from cybrxkhan/master

Moving files to beta
Silk Road decision tweaks
Portrait_properties.txt fix
Removed reference to sogdiangfx in VIET
Cleaned up trait snarl

Deleted extra file and reset the references to the actual traits
First fix/cleanup pass over VIET_Events