Simplify auto-complete 

- Add expand-region (it ROCKS!)