added shortcodes
Merge branch 'master' into shortcode
Merge branch 'master' into shortcode
Fix crop not working. Inverted logic. Width always comes first!
Only try and crop to position if cropping
remove !
Merge pull request #66 from humanmade/bug-admin-edit-page-screwed

Bug admin edit page screwed
Merge branch 'refs/heads/master' into bug-crop-to-pos-not-working
fix order of crop to position args in test
Added sample config for unit tests
Merge branch 'master' of github.com:humanmade/WPThumb
Merge branch 'refs/heads/master' into bug-crop-to-pos-not-working
Merge pull request #65 from humanmade/bug-crop-to-pos-not-working

Fix crop not working. Inverted logic. Width always comes first!
Removed external lib
tests-config no longer needed
ignore trunk (for unit tests)
New bootstrap for new tests
Wrong file, duh!
new travis yml
install script for travis