update bukkit to use hyphens; sass
Merge branch 'rank'