Bring codebase up to date with master omniwallet repo