Updated Twitter Logo and added a Tumblr Button

Some miscellaneous cleanup and I included a bug fix from another branch as well.

Closes #11 and closes #12