Merge pull request #64 from raderj89/master

Fix rspec tests
fixed bug in concerts.css.scss
fix conflicts
removed test files
added secure env variables to travis.yml
change database.yml to work with travis