OS X :: Minimize Button Hides Window, Doesn't Put It In Dock?

I love how in OSX you can go to a Window in the dock and click hide:


Instead of the window minimizing and taking up even more room on the dock, it just hides in the already existing icon (in this case the active window hides in the safari icon). When I click minimize on the actual window this happens:


Now Safari is taking up two spaces on my dock. Is there any way to make it so every time, no matter what the window is, if you click minimize or even exit, it hides the window as opposed to minimizing it and wasting a dock space?