Resolving a merge issue with production.rb
Merge branch 'master' of https://github.com/zombiepaladin/smartfarm
Merge branch 'master' of https://github.com/zombiepaladin/smartfarm