refactoring
Merge branch 'master' of http://github.com/takaho/snpexp

Conflicts:
	src/recrec.cxx