Tidy settings

![image](https://cloud.githubusercontent.com/assets/51415/3851089/234fa2ec-1e90-11e4-841b-f11648370030.png)

fix #570