Whitespace fixes

One comprehensive commit to use whitespace consistently would be nice. Editors that highlight odd whitespace show the current situation:


![image](https://cloud.githubusercontent.com/assets/33569/5197538/c538695e-74f8-11e4-8d47-62732d99ca3c.png)