Fix topology use of < in template context
Fix warning in shuffle test on MSVC
Merge pull request #679 from MetaScale/issue_675-msvc10_shuffle_fix

Fix for #675