Added Pre tag to error 500 templates
Merge branch 'development' of github.com:balderdashy/sails into development

* 'development' of github.com:balderdashy/sails:
  Updated Travis Info