Merge pull request #31 from donny-dont/cleanup

Lets try this again
Latest.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Latest

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Merge remote-tracking branch 'upstream/master' into cleanup
Fixes for skinning.