change post titles to links, clean up small things
changes and cleaned up the merge conflicts
Merge pull request #2 from q45/clean_up

Clean up