removed the Gemfile.lock from git - might be causing problems.  turned off autolayout