Remove upgrade tool and R executable from config tool
Remove Windows wrapper scripts (bat)
Remove migrate/upgrade wrapper scripts
Remove Windows server support (win32)
Remove support for multiple configuration values
Add special R-2.x installations to install-chipster.sh
Add simple-configure support for public/private IP's
eXpress: Bowtie2 command changed, added id sort to count file.
Merge branch 'master' of https://github.com/chipster/chipster.git
Final eXpress polish.
Merge branch 'master' of https://github.com/chipster/chipster.git
Implement support for "edit" commands in configure tool
Merge branch 'master' into data_beta

Conflicts were resolved:
	build.xml
	src/main/resources/build.number
	src/main/resources/version.number