Adding bugfix
Make travis work by disabling not working stuff
Remove/disable unused travis options
Merge pull request #5 from rail/cleanup

Cleanup
Merge branch 'master' of https://github.com/theharshest/build-funsize into theharshest-master
Merge branch 'theharshest-master'
Merge branch 'master' of github.com:mozilla/build-funsize

Conflicts:
	tests/integration-test.sh