Implemented the ability to enable and disable options and optgroups in select tags with tests.
Merge branch 'master' into add-disabled-attribute-to-select-options
Provide a way for end users to customise admin generators
Added ability to use custom generator templates
Fixes #1225
Prevent logging of health-check requests at log level over :debug
Typo fix
Merge pull request #1303 from Ortuna/typo

Typo fix
Added ortuna to notifications on Travis build fails
Merge pull request #1304 from Ortuna/ortuna-travis-notifications

Added ortuna to notifications on Travis build fails
Ensure requiring active_record, fix #1247
Merge pull request #1306 from udzura/patch-2

Ensure requiring active_record, fix #1247
Lock nokogiri to 1.5.9 since it droped support for 1.8
See if 1.5.10 works with PR before merge
Merge pull request #1307 from Ortuna/nokogiri-lock

Lock nokogiri to 1.5.10
fixed haml_tag so it doesn't explode with undefined method with_raw_haml_concat
Don't need the setup code
Merge pull request #1309 from Ortuna/haml-library

fixed haml_tag so it doesn't explode with undefined method with_raw_haml...
Ignore Vim swap files on GIT
Merge pull request #1311 from padrino/gitignore-vim-swap-files

Ignore Vim swap files on GIT