fix flann recipe a bit, bump build number
Merge branch 'master' of github.com:dougalsutherland/conda-recipes