updates
gem lock
Merge branch 'master' of github.com:appliv/ironfan
updates