Cleanup, nogapps build now happens when doing a +gapps build for no extra time (faster building), Travis fix for releases