Normalise screen size notation

Re-sending PR from the WIP branch 

https://github.com/twitter/bootstrap/issues/7706