Align hard tabs

Continuation of  #2225 

Fixes #1845 

![screen shot 2014-06-18 at 5 20 30 pm](https://cloud.githubusercontent.com/assets/671378/3322292/9bb88264-f747-11e3-9370-bf3267c6fdde.png)