Minor updates (trackpoint params for awesome and new marks in vimperator).
Merge branch 'state'