First stab
Merge branch 'master' of https://github.com/alexsoble/gifmaster

 'master' of https://github.com/alexsoble/gifmaster

This is a really big merge.