Merge pull request #1 from tomchristie/master

Merge updates from origin
Merge branch 'master' of github.com:devbliss/mkdocs

merged with master
Merge remote-tracking branch 'upstream/master'

Sync with upstream
Merge pull request #2 from devbliss/feature/clear-site-directory-option

Added feature: clear site directory switch
Merge pull request #3 from devbliss/feature/clear-site-directory-option

Added feature: clear site directory switch
Fixed wrong order of media files copy from theme dirs (own, base -> base, own) to prevent own files being overwritten by their base counterparts
Merge remote-tracking branch 'upstream/master' into bug/incorrect-theme-dir-order

Synced with upstream
Merge pull request #170 from devbliss/bug/incorrect-theme-dir-order

Fixed incorrect theme dir order for media files