remove pending test
remove merge conflict head from _show partial
change default strategy to simplefoursquare
remove redundancy from places controller spec
Merge pull request #48 from banana-slugs-2014/master_hotfix

Master hotfix