switch branch with .yml
i need away to add master +branch in this thing

Signed-off-by: bootz <bootz@projectskyfire.org>
rabble test build

Signed-off-by: bootz <bootz@projectskyfire.org>
Core/Dependencies: Upgrade to jemalloc-3.3.1 (Also fixes a few weird crashes), closes #7852
Note: This adds support for using jemalloc on FreeBSD, Mac OS X Lion and a few other platforms (not enabled by default)
Please read dep/jemalloc/ChangeLog for further information (Changed from 2.1.1 and up apply)
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU into test

Conflicts:
	.travis.yml

Signed-off-by: bootz <bootz@projectskyfire.org>