Code changes to reduce number of warning messages.

Code changes to reduce the number of warnings that are generated
when sass code is run as part of the sinatra test suite.
Fixes based on nex3's feedback.

Rename a few variables.
Remove variable initialization code
Merge pull request #636 from rurounijones/warning_hunt

Code changes to reduce number of warning messages.