Unify Nginx files to match as closely as possible

Also includes minor formatting changes.

SSL Nginx file on left, normal on right
![image](https://cloud.githubusercontent.com/assets/1192780/4017086/1fe6045e-2a3c-11e4-919e-4ddbbcfd954c.png)
![image](https://cloud.githubusercontent.com/assets/1192780/4017129/bc7b53dc-2a3c-11e4-8cbe-da5d3b7cd9cc.png)
![image](https://cloud.githubusercontent.com/assets/1192780/4017147/dd74f2c8-2a3c-11e4-9050-f3c17840250b.png)