Added some test data, changed a couple of names
Merge branch 'master' of https://github.com/hirish/trolley

* 'master' of https://github.com/hirish/trolley:
  adding serving size selector
  Trying again with AWS...