Merge pull request #1 from suewhite/master

Merge pull request #38 from Shadae/shadaerss
Merge pull request #39 from suewhite/github

Github
Merge branch 'master' into github
social media icons
fixed merge conflicts
Merge pull request #41 from suewhite/posts

Posts
Merge branch 'master' into github
now with more support for ATOM. todo: xml
Merge pull request #42 from suewhite/rss

now with more support for ATOM. todo: xml
Merge branch 'master' into github
Fixed bug on Tumblr feed saving
Merge branch 'shadaerss' of github.com:Shadae/See-More into shadaerss
Merge pull request #43 from Shadae/shadaerss

Shadaerss
adds javascript to user's page
adds javascript to user's page
Merge pull request #44 from suewhite/posts

Posts
rss, atom, and xml
Merge pull request #45 from suewhite/rss

rss, atom, and xml
cleanup
clean up unneeded provider strategies