merged some items from https://code.google.com/p/iosched/source/browse/.gitignore

merger from https://code.google.com/p/iosched/source/browse/.gitignore