Added renames for some files
Merge branch 'master' of git://github.com/bravesheep/ideal