boskee Merge

merged with boskee, will mod later.
(dont know how to do this on Windows, sorry)