Set a default locale so Google crawl doesn't blow up
Merge remote-tracking branch 'origin/2014'
Used Allow directive instead of Disallow to allow all robots
Merge branch 'master' into 2014