Merge branch 'robbyrussell/master' 20140409
remove deleted files