updates

Signed-off-by: Saso Matejina <saso@coinbase.com>
Merge branch 'saso_toshi_explorer' of github.com:smatejina/toshi into samo_toshi_updates

Conflicts:
	lib/toshi/web/views/layout.erb
Toshi Exp style