Changed the API key
identation fixes
Merge branch 'master' of https://github.com/shoestrap/shoestrap