Merged development branch into default branch.
merged with development branch to incorporate important bug fixes.
merged remaining changes from development branch.
merged a few remaining changes from the default branch for bug fixing.
Changes to fix SpineML_2_GeNN for clean clone
Added IRIS classifier as a userproject
Merge pull request #37 from genn-team/Alan_Classifier_Work

Added IRIS classifier as a userproject
Fixed makefile issue when linking obj file

The makefile appears to treat the &> syntax as an instruction to run in the background rather than redirect all to file. This may only be an issue with some flavours of Linux
Merge pull request #38 from genn-team/fix-makefile-output-redirect

Fixed makefile issue when linking obj file
Merge pull request #39 from genn-team/master

pulled makefile fix from master
Added missing makefile
Merge pull request #40 from genn-team/Alan_Classifier_Work

Alan classifier work
Merge branch 'master' into development