travis badge for master branch
Add the ability to specify parent controller name
remove whitespace
Ruby version set properly
Merge branch 'master' of github.com:excid3/rails-admin-scaffold into excid3-master
Merge branch 'excid3-master' into develop