Fixed a bug in partitionENVsequence when the mapping mode was not amino-acids
Merge branch 'master' of github.com:veg/hyphy

Conflicts:
	contrib/gtest-1.7.0/CMakeFiles/CMakeDirectoryInformation.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest.dir/DependInfo.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest.dir/build.make
	contrib/gtest-1.7.0/CMakeFiles/gtest.dir/cmake_clean.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest.dir/cmake_clean_target.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest.dir/flags.make
	contrib/gtest-1.7.0/CMakeFiles/gtest.dir/progress.make
	contrib/gtest-1.7.0/CMakeFiles/gtest_main.dir/DependInfo.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest_main.dir/build.make
	contrib/gtest-1.7.0/CMakeFiles/gtest_main.dir/cmake_clean.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest_main.dir/cmake_clean_target.cmake
	contrib/gtest-1.7.0/CMakeFiles/gtest_main.dir/flags.make
	contrib/gtest-1.7.0/CMakeFiles/gtest_main.dir/progress.make
	contrib/gtest-1.7.0/Makefile
	contrib/gtest-1.7.0/cmake_install.cmake