Add log info.
Merge from master.
Clear Andrew and Dan's review notes.
Merge branch 'master' into gsong_log

Conflicts:
	src/main/scala/com/twitter/scaffold/Scaffold.scala
Merge pull request #68 from mergeconflict/gsong_log

fix #50: logging