* remove commented line
Merge branch 'master' into develop

* master:
  * adds start_puma script
* use asset pipeline as it was meant to be used :)
Merge branch 'release/0.0.5'