BTC amounts are now displayed alongside the dollar amounts (no separate views)

Add tests for status controller

Change TransactionView to display BTC amounts as well as USD. Add Tests

Minor Cleanup

Added option for viewing past transactions in BTC

Fix more merge-related issues