numerous updates
added test-vic-vars
rm test-vic-var