Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
add the user home to the collins init
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' into dan-collins-similar
remote query timeouts causes 504 instead of 500 response
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' into dan-collins-similar
Fixing merge conflicts for collins host
Merge pull request #12 from tumblr/fibr-ux-fixes

Fibr ux fixes
adding functionality to Asset to find matching nodeclass asset
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
Merge branch 'master' of github.com:tumblr/platform
filling in SimilarAssetAction, moving common methods to AssetResultsAction trait

handleSuccess takes a boolean instead of an AssetFinderDataHolder as its second
parameter, since details was the only property being used and Similar action
doesn't use AFDH
Moved IpAddress functionality to proper actions

Still need to do testing. I need to create a little cucumber suite for the
functional API testing.