Removed ace
Removed old ide junk
Removed some more ide junk
Updated gemfile.lock
Merge branch 'cleanup'