Add cpu_speed to flavors
Merge branch 'master' of github.com:6fusion/fog
Revert "Add cpu_speed to flavors"

This reverts commit 4d859d6fbee0dd17638b942ba680e91aacd01b49.
Merge remote-tracking branch 'origin/master' into joyent-analytics