2.4.0 version bump
Merge branch 'master' of github.com:pipermerriam/flex