Merge pull request #49 from dheckman/master

added basic mapbox map to discover page
temporarily fixed foursquare/twitter login