Minor fixes and additions for latest update

7/11/13
Merge remote-tracking branch 'upstream/master'
Better fixes
Even better fixes

Previous 2 commits had bad "ClentScheme.res" files.
Merge remote-tracking branch 'upstream/master'