Merge branch 'dev', get rid of development stuff ready for release
Merge branch 'master' of https://github.com/dcmuller/bsoptim

Conflicts:
	stata/bsoptim.ado