Merge from Justin
[selectricity] / .bzrignore
1 database.yml
2 development.log
3 production.log
4 server.log
5 test.log
6 tmp
7 public/engine_files
8 .DS_Store

Benjamin Mako Hill || Want to submit a patch?