Manually merged higuys' changes to do OSX build
Merge branch 'managesatoshi' into osx_managesat
Getting closer to having a working .app build...
Looks like everything works except notifications
Added URI-registration to settings window

Getting ready to merge OSX updates, and doing prep for 0.88 release.
Merge branch 'testing' of github.com:etotheipi/BitcoinArmory into testing
Fixed a merge error
Merge remote-tracking branch 'remotes/origin_readwrite/osx_managesat' into testing
Updated version number for final testing release