Merge pull request #1 from wtsi-npg/devel

Devel
Merge pull request #2 from wtsi-npg/devel

Bug fixes and test suite
Merge pull request #4 from wtsi-npg/devel

Devel
Changes to handle precise and gcc 4.8
Merge branch 'devel'

Conflicts:
	Makefile
Ooops! Missed out snp.h
Merge pull request #6 from wtsi-npg/master

update dev branch from master (I hope)