Removed some inclusions.
Removed a bunch of needless inclusions.
Removed some more inclusions.
Fixed a few style problems.
Merge branch 'sam_alt' into sam_inc
Removed unused variable empty_stream_msg.
Merge branch 'next' into sam_clang35
Merge branch 'next' into sam_inc

Conflicts:
	src/rdb_protocol/wire_func.cc
Made generate_serialize_macros.py include archive.hpp... for now.
Merge branch 'next' into sam_clang35
Merge branch 'sam_clang35' into next
Merge branch 'next' into sam_inc
Merge branch 'sam_inc' into next