Merged in @lkangs stuff 

Public Bitcoin addresses now show up

- Changed getBitcoinAddress to getAddress
- Cleaned out the extra spaces