using cached wikia api, minor fixes
Merge branch 'TimeMachine' of https://github.com/Wikia/app into TimeMachine