zoom icon tweak
Merge remote-tracking branch 'upstream/master'
added definitions
removed twitter button
Merge pull request #137 from jpecht/master

added definitions / zoom icon tweak / removed twitter button