zip
pull in master and rebuild
pull in master and merge
re grunt
rebuildn
merge and rebuild
zippy
pull in master
gah zip
stuff
rebuild
zippy
update
pull in badges
pull in master
setup locales en file
translations
translations 2: the sliderning
simplify sidebar nested include madness
translations 3: return of the tag filter