Fix link to History page from Release v1.2.0 notes post.
Update History to reflect what happenend in d48f339a1fb8dbf8b2087ef6082e14d3a3e47aef.
Fix merge conflict.
Fix problem link to /docs/history/ in v1.2.0 release post.
Update history and History.markdown so it is consistent with previous release headers.