Fixed upgrade code to work with automatic plugin updates
Brought in master to settings-layout branch.

Had to resolve conflicts on class-pinterest-pin-it-button.php via
Tortoise Git. Probably a better way to do this in the future.
Merge pull request #2 from pderksen/settings-layout

Merge master to settings-layout.