Merge pull request activeadmin#1 from activeadmin/master

update master

.gitignore

@@ -1,16 +1,20 @@
-## MAC OS
+## Mac
 .DS_Store
 
-## TEXTMATE
+## Windows
+.Thumbs.db
+
+## TextMate
+*.tm_project
 *.tmproj
 tmtags
 
-## EMACS
+## Emacs
 *~
 \#*
 .\#*
 
-## VIM
+## Vim
 *.swp
 # IDEA / RUBYMINE
 .idea
@@ -20,15 +24,16 @@ tmtags
 .ruby-version
 .ruby-gemset
 
-## PROJECT::GENERAL
+## Project (general)
 tags
 coverage
 rdoc
 doc
 .yardoc
 pkg
 
-## PROJECT::SPECIFIC
+## Project (specific)
+bin/
 .bundle
 spec/rails
 *.sqlite3-journal
@@ -41,3 +46,4 @@ public
 .rspec
 .rails-version
 .rbenv-version
+.localeapp/*

.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  enabled: true

.travis.yml

@@ -1,11 +1,36 @@
 language: ruby
-script: bundle exec rake test_with_coveralls
+install:
+  - time ./script/travis_cache download_bundle
+  - time gem install bundler # use the very latest Bundler
+  - time bundle install --without development --path=./bundle
+  - bundle clean # delete now-outdated gems
+  - time ./script/travis_cache download_app
+  - time bundle exec rake setup
+  - time ./script/travis_cache upload
+script:
+  - time bundle exec rake test_with_coveralls
 rvm:
-  - 1.9.3
-  - 2.1.0
+  - 1.9
+  - 2.1
+  - 2.2
 env:
-  - RAILS=3.2.16
-  - RAILS=4.0.2
+  matrix:
+    - "RAILS=3.2.21"
+    - "RAILS=4.1.8"
+    - "RAILS=4.2.0"
+  global:
+    secure: lRYUGVUV94eqrR7C0b0hhvp+W76NkLRAn6jkJGCbRCEojbeb3HlgK1P+nTDeIuiDmXksJOG6VD3ZiZAn9Plznj7I/MFh+ijgvk8eWj9QNxA8riaSEPAu5VYtPA+uaw1olUt196U3qXH+SaXB4sx5wdIUXpd9qxWWWsW11ia0Jzs=
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: "RAILS=4.2.0"
+  exclude:
+    - rvm: 2.2
+      env: "RAILS=3.2.21"
+    - rvm: 2.1
+      env: "RAILS=4.1.8"
+    - rvm: 2.1
+      env: "RAILS=4.2.0"
 notifications:
   irc:
     channels:

.yardopts

@@ -1,8 +1,7 @@
 lib/**/*.rb
 --protected
 --no-private
---exclude features
---plugin redcarpet-ext
+--exclude (features|lib\/generators\/active_admin\/.*\/templates)
 -
 README.md
 CHANGELOG.md