Adding Puma as the default server and updating rails to 4.0.4
Improved code style