Moved some code to functions.
Merge branch 'master' of https://github.com/avoliva/libsass