un-revert merge of PR#928, now in a branch

This reverts commit 124def360223447db790adeba1ef1b799730b26b.
Updated texture loading

handled the move into the assets/ directory
also updated texture names
Merge branch 'snapshot'
Fixed default texture loading

Now accounts for the versions directory, which is maintained by the new
launcher
Edited the texture-finding code for 1.6

Now correctly avoids globbing problems. Removed a bit of irrelevant code
for old style minecraft.jar. Tweaked error messages for resource packs
instead of texture files.
Fix typo in textures.py
updated "installing the textures" section of the docs

Also fixed docstring in textures.py for the find_file method.
fixed bug that occurs when %HOME% is set on windows
updated Installing Textures section of the docs

Added a command to download the official textures. Reworded the rest of
the section for clarity.
Merge branch 'master' of github.com:overviewer/Minecraft-Overviewer
removed mkdir command in installing the textures

Apparently the wget -P flag creates directories.
fixed wording related to texturepath in config docs

Changed to be more accurate with the resource pack changes in minecraft
1.6
Correct cobblestone texture

Fixes #953
Fix more cobblestone textures

Also a comment typo and the base of a lever texture
Merge pull request #956 from duckman/patch-1

Fix more cobblestone textures
Fix LookupError for unknown encodings.

Sets the preferred encoding to UTF-8 if python is unable to find a codec
for the value returned by locale.getpreferedencodings() function.
emit a warning (but don't crash!) on unexpected empty tiles
Update contribManager list with recent contrib scripts
Merge PR #960
Update travis configuration to pull correct minecraft JAR

MC_VERSION will need to be adjusted as part of each update