don't need ruby in front
Merge branch 'master' into df14-workshop
images
Merge branch 'df14-workshop' of github.com:hybridgroup/cylon-site into df14-workshop