added conditions to prevent conflicts to rails 4.0.5
Merge branch 'master' of github.com:dropstream/stupidedi