Merge branch 'modular_handshake' of github.com:arik-so/rust-lightning into modular_handshake

� Conflicts:
�	lightning/src/ln/peer_handler.rs

Author: arik-so