Committed some conflicting files by accident, this clears them out

Signed-off-by: Nic Rosental <nic@epiclabs.com>
fixed gemfile