tie nokogiri to 1.6.2.1 for omnibus happiness
Merge branch 'master' of github.com:flapjack/flapjack