Merge pull request #91 from LI-HE/master

minor change to correctly show current user country
Updating travis-ci
Modified travis config
Trying alternate Travis config
Feedback static pg
story modal update
Accepted Challenges update
Reverting to action configuration
Updating logins to redirect back to the current page
index comments clean-up
challenges.html update

- edited to 4 tabs in a row
- edit tab headings
Merge pull request #26 from ChrisBoesch/master

update