code cleaning and formating
Merge branch 'master' of https://github.com/sancowinx/blacktie-tumblr