Use shared_ptrs
Updates after review
Merge pull request #90 from Metaswitch/iss509

[Reviewer: Alex] Use shared_ptrs
Merge remote-tracking branch 'origin/master' into sto639
Add back in creation of new_peers vector (mistakenly deleted)