Made printf_buffer_t be a bit simpler.
Made arch/runtime/runtime.hpp not include arch/runtime/coroutines.hpp.
Moved callable_action_t out of runtime_utils to its own hpp.
Made runtime.hpp not include runtime_utils.hpp.
Removed or adjusted some inclusions of runtime.hpp.
Fixed real dumb compilation errors by putting some includes back.  I am dumb.
Moved variable_scope_t implementation to scope.cc.
Revert "Moved variable_scope_t implementation to scope.cc."

This reverts commit 3e23c9e19e9413116a1dceb9d2a7e927ec593fa4.
Merge branch 'sam_scopes' into sam_header_cleanup
Made perfmon/core.hpp not include scoped_regex.hpp.
Merge branch 'next' into sam_header_cleanup
Merge branch 'next' into sam_header_cleanup
Merge branch 'next' into sam_header_cleanup

Conflicts:
	src/rdb_protocol/func.cc
Fixed merge conflict merging next into sam_header_cleanup.
 Merge branch 'next' into sam_946