wip
Merge branch 'master' of github.com:mavenlink/mavencraft

Conflicts:
	andrew/build.rb
	minecraft-wrapper/client.rb