automatically rename question IDs whenever there is a conflict

+ a tiny bit of formatting cleanup

![image](https://cloud.githubusercontent.com/assets/66555/2531134/f3a36d2e-b52d-11e3-8495-71c37db52b42.png)