Fix non-circular-require warnings

This fixes miscellaneous warnings in fog including unused variables,
indentation mismatch and one warning for a duplicated attr_reader.
Merge pull request #1774 from drbrain/fix_warnings

Fix non-circular-require warnings