bundle update
Incorporate rails 4 generation diffs
Rails 4 and Druthers FTW! at least the tests run now...
renamed "originals" to "masters" and fixed more Settings[] references
fixed more Settings[] references
added username for travis
added username for travis