Accommodating changes to NodeId.
Merge pull request #31 from Fraser999/MAID-537

Accommodating changes to NodeId.
Timeout increase, stops client after tests, defaulted error code.
Merge pull request #34 from BSMaidSafe/BugFix6

Timeout increase, stops client after tests, defaulted error code.
Merge branch 'next' into account_transfer