Forward-port donokuda/history-view-spike into master

commit 525cfdb732bbfa3a139ed322936fe84856872a67
Offset the merge icon just a little bit

commit 84ef49ea20c4083eca686ab10518f85db2255707
Remove some added lines

commit 8633f9426513ed8455f1f88a2705ad7d5ab60025
Move it into a function

commit 8f9348df7d1c7f76b7c2c123a1dbc3562ad6bdd6
Do the same for the merge icon

commit d1cb2edb6004bf3b6c6eec7cbb877c13076054ec
Manually draw the top and bottom timeline bars

commit aa7d72c98cc2710c8004a404f8acdf715b13dc1f
Remove some comments

commit 11716e91beca0e99dc59051e8dbb1b9c1db481d5
Add indicator dot

commit 978569d98336f730f041c263b9ceefe72c60f5ee
Render the merge icon

commit c9b167663e496ac238d7f1431b4c5a2c70623b94
Render octicons on top of everything

commit e1ff48a8f256924b80baa9911abaf0c7b611904d
Add dot and merge icons

commit 3f0ec2f28114cb203ef04711134a7bfe30a2b207
Fix height and how we render the bar

commit 944fef52f059aa69b00825560bd09c8500d52bd8
Draw the bar

commit a7a3d9f6dc8e2104ad5d76d6877e9806c8a302f9
Bump summary content a little more

commit b4f5498feba820e16380ecd0f79c8b329ff9afca
stop clipping the authors!

commit 5bd91b023aa8fe9826c6de940e3e56587eb51975
Better spacing

commit 5a424f39b6d2131b78367d5acfc724880743fbc0
Also render the entry box
Since I want the entire background to be blue when focused

commit 906c6a25762cc6a5ea89aca8249ddc11b109bf66
Use contentOffset instead for padding

commit 5fa6fc00c4f4e7a442a251a9f251653732e5121c
Work around some spacing