House Cleaning
Merge branch 'master' of github.com:b1nd/aws-streamer

Conflicts:
	config/aws.php