Add instructions on how to merge from head

Hello @nicks, 

Please review the following commits I made in branch 'nick-readme'.

10a98c3d3c4aa4a8f1380b620fa9855cb2feefd4 (2013-08-26 12:13:13 -0400)
Add instructions on how to merge from head


R=@nicks