Restore scp functionality.

Restore original scp commit.
Fix require scp so it does not require gem on master.