fixed database.yml in gitignore
faster specs should run before slower cucumber
seems font awesome needs to be outside assets
Merge pull request #176 from kunks001/polishing_target_emails

fixed database.yml in gitignore
Resolve conflicts with upstream in .travis.yml