* change trunk to master repo
* merge
Merge branch 'master' of git://github.com/Scalr/cookbooks
* fix url for centos in dev_bootstrap
Merge branch 'master' of git://github.com/Scalr/cookbooks