Handle version 6 of slices and normalize between versions
Fixes slice parsing issue
Merge branch 'version_6_slices'
Fixes #39 as best as possible. Might need further inspection.
Cleanup
Make this business a little more rspec-y
Remove incorrect optimization when parsing channel images
Merge branch 'master' of github.com:layervault/psd.rb
Merge branch 'master' into layer_styles
Start of MaskService