Cleaner.
Merge branch 'master' of git@github.com:spruceboy/shiv
Changes for silver light idiotcy.
 -JC

Signed-off-by: jc <jc@alaska.edu>