Merge pull request #16 from thomasalrin/master

test ec2 json-attribute change
Merge pull request #17 from thomasalrin/master

test ec2 changes
Merge pull request #18 from thomasalrin/master

test ec2
a minor fix to have single quoted json_attributes
Merge remote-tracking branch 'origin/master'

Conflicts:
	iaas/ec2/iaas.go
Merge pull request #19 from indykish/master

wrap json_attributes in backquote to escape a single quote.
Fix json parsing error
Merge pull request #21 from rajthilakmca/master

Fix json parsing error
defer Flush of log, load identity file from /var/lib/megam/megamd path
Merge pull request #22 from indykish/master

defer Flush of log, load identity file from /var/lib/megam/megamd path
minor fix to ec2
Merge pull request #23 from indykish/master

minor fix to ec2
upgrade golang to 1.4.beta1
Merge pull request #24 from indykish/master

upgrade golang to 1.4.beta1
Add docker proviioner
Merge pull request #25 from rajthilakmca/master

Add docker proviioner
Fix docker error and issues
Merge pull request #26 from rajthilakmca/master

Fix docker error and issues
deletefix
iefeMerge remote-tracking branch 'origin/master'