refactor and cleanup
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
resolve merge conflict
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
prepare for foursquare realtime api
Merge branch 'dev' of https://github.com/gowaddle/waddle into dev
Merge pull request #122 from atungare/dev

prepare for instagram