Added unicorn, neatened up gemfiles