I started using PyxelEdit. Not sure if it'll stick around for really big projects but it's a little quicker and nicer using one hyper-focused program to do the work of two!
