updates to rails 3
pull in changes
style updates and completes rails 4 upgrade