updated the ignore with the other uneeded files
Updated for heroku
changed directories
Merge branch 'dev'