Ignore example.setup.
Merge branch 'Jun2014' into develop

* Jun2014:
  Ignore example.setup.