Really a test to see if new linux box works with rails and can push to git/resole merge conflicts