merging githubs gitignore with rails 4.1
initial commit