Merged ember/rails apps and cleaned up