Checking in latest and greatest.
Merge branch 'master' of github.com:benbishop/MonkeyArms

Conflicts:
	MonkeyArms/MonkeyArmsPCL/DI.cs
Merge branch 'master' of github.com:benbishop/MonkeyArms