general cleanup and auto-code-formatting
Merge branch 'master' of https://github.com/depstein/ludumdare30

Conflicts:
	Unity/Assets/Scripts/DialogNode.cs
ignore suo
Merge branch 'master' of https://github.com/depstein/ludumdare30

Conflicts:
	Unity/Assets/Scripts/LoadPeople.cs
Merge branch 'master' of https://github.com/depstein/ludumdare30