remove city/state/zip, add quantitiy migrations

Cant stop, she is amazing

![1282362052504](https://f.cloud.github.com/assets/4682033/1680255/68205010-5d70-11e3-9558-4fdc51f564a6.gif)