Use string formatting in log statement.

This is cleaner than catting a bunch of strings together.
Handle object expressions in substitute
Fix a bug where call arguments were subbed in as expressions
Merge branch 'master' of github.com:ksheedlo/csci3155lab4