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/5197536/bb86feac-74f8-11e4-867e-276604415421.png)