Fixed whitespace and header inclusion style problems.
Made peer_address_set_t::iterator be a const iterator, made initial_join.cc not use non-const references.
Fixed some style problems (explicit constructors, include ordering).
Handled several style problems related to the use of long or short (using NOLINT to silence the warnings).
Put NOLINT on all the json adapters for (unsigned) (long) long types.
Merge branch 'next' into sam_style
Merge branch 'next' into sam_style
Merge branch 'next' into sam_style
Merge branch 'sam_style' into sam_cxx11