update boost to 1.54
Merge branch 'master' of https://github.com/henrique/thrift

Conflicts:
	.travis.yml