major update to bowtie2. no tests yet
added test and test files
modified bowtie wrapper per bgruening and jmchilton suggestions
added package_bowtie2_2_4
new version string for bowtie2
added bwa and bwa-mem after removing command line options. planemo tests are passed. i will close my own bwa-mem github repo and will only maintain these under tools-devteam github repo after this PR is accepted
Moved bwa_7_10 package to packages dir
changed version string of bowtie2 per Marten's request
Merge branch 'master' of https://github.com/nekrut/tools-devteam into nekrut-master

Resolved Conflicts in :
	tools/bowtie2/bowtie2_wrapper.xml