Code cleanup.
Code cleanup.
Merge branch 'master' of https://github.com/corliss/ExpandProject

Conflicts:
	ExpandProject/Program.cs
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.
Code cleanup.